Refreshed translation files to contain the keyboard configuration

strings.

Signed-off-by: Ira Rice <irarice@gmail.com>

25 files changed, 15193 insertions, 8719 deletions

diff --git a/po/aethyra.pot b/po/aethyra.pot
index 9e8e8579..46589cc6 100644
--- a/po/aethyra.pot
+++ b/po/aethyra.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The Mana World Development Team
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-08 22:10+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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,881 +16,2166 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/gui/buy.cpp:43 src/gui/buy.cpp:61 src/gui/buysell.cpp:35
+#: ../src/gui/buy.cpp:42 ../src/gui/buy.cpp:45 ../src/gui/buy.cpp:60
+#: ../src/gui/buysell.cpp:34
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:58 src/gui/buy.cpp:239 src/gui/sell.cpp:65
-#: src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: src/gui/buy.cpp:62 src/gui/sell.cpp:69
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr ""
 
-#: 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:70 src/gui/sell.cpp:230 src/gui/sell.cpp:244
-#: src/gui/trade.cpp:94 src/gui/trade.cpp:266
+#: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
-#: 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:71 src/gui/sell.cpp:232 src/gui/sell.cpp:245
+#: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr ""
 
-#: src/gui/buysell.cpp:31
+#: ../src/gui/buysell.cpp:30
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:35 src/gui/sell.cpp:48 src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 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
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
+#: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/char_select.cpp:81
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr ""
 
-#: 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"
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: src/gui/char_select.cpp:86
-msgid "New"
+#. ----------------------
+#. Status Part
+#. ----------------------
+#. Status Part
+#. -----------
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
+#, c-format
+msgid "Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:87 src/gui/setup_players.cpp:220
-msgid "Delete"
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
+#, c-format
+msgid "Job Level: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:88
-msgid "Previous"
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
+#, c-format
+msgid "Money: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:89
-msgid "Next"
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
+msgid "New"
 msgstr ""
 
-#: 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"
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
+msgid "Delete"
 msgstr ""
 
-#: 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"
+#: ../src/gui/char_select.cpp:99
+msgid "Previous"
 msgstr ""
 
-#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:173
-#: src/gui/char_select.cpp:185
-#, c-format
-msgid "Job Level: %d"
+#: ../src/gui/char_select.cpp:100
+msgid "Next"
 msgstr ""
 
-#: src/gui/char_select.cpp:94 src/gui/char_select.cpp:186
-#, c-format
-msgid "Money: %d"
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
+msgid "Ok"
 msgstr ""
 
-#: src/gui/char_select.cpp:174
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: src/gui/char_select.cpp:243
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/char_select.cpp:250 src/gui/login.cpp:44 src/gui/register.cpp:65
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr ""
 
-#: src/gui/char_select.cpp:253
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr ""
 
-#: src/gui/char_select.cpp:256
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr ""
 
-#: src/gui/char_select.cpp:257
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr ""
 
-#: src/gui/char_server.cpp:52
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr ""
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: src/gui/chat.cpp:122
-msgid "Global announcement:"
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
+#: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
+msgid "Chat"
+msgstr ""
+
+#: ../src/gui/chat.cpp:148
+msgid "Global announcement: "
 msgstr ""
 
-#: src/gui/chat.cpp:125
+#: ../src/gui/chat.cpp:153
 #, c-format
-msgid "Global announcement from %s:"
+msgid "Global announcement from %s: "
 msgstr ""
 
-#: src/gui/chat.cpp:140 src/gui/login.cpp:46 src/gui/register.cpp:68
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr ""
 
-#: src/gui/chat.cpp:146
+#: ../src/gui/chat.cpp:329
 #, c-format
-msgid "%s whispers:"
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/chat.cpp:283
-#, c-format
-msgid "Whispering to %s: %s"
+#: ../src/gui/chat.cpp:353
+msgid "Trying to send a blank party message."
+msgstr ""
+
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
+msgid "Return toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:483
+msgid "Message closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:493
+msgid "Return now toggles chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:501
+msgid "Message now closes chat."
+msgstr ""
+
+#: ../src/gui/chat.cpp:506
+msgid ""
+"Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/gui/chat.cpp:356
+#: ../src/gui/chat.cpp:513
+msgid "Unknown party command... Type \"/help\" party for more information."
+msgstr ""
+
+#: ../src/gui/chat.cpp:557
+msgid "No such spell!"
+msgstr ""
+
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
+msgid "Present: "
+msgstr ""
+
+#: ../src/gui/chat.cpp:593
+msgid "Attendance written to record log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: src/gui/chat.cpp:366
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:369
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:372
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:375
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/gui/chat.cpp:378
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: src/gui/chat.cpp:381
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/gui/chat.cpp:389
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/gui/chat.cpp:392
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/gui/chat.cpp:395
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/gui/chat.cpp:398
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: src/gui/chat.cpp:401
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/gui/chat.cpp:404
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: src/gui/chat.cpp:407
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/gui/chat.cpp:410
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:413
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/gui/chat.cpp:416
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/gui/chat.cpp:419
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/gui/chat.cpp:425
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: src/gui/chat.cpp:428
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/gui/chat.cpp:431
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:766
+msgid "The current party prefix is "
+msgstr ""
+
+#: ../src/gui/chat.cpp:771
+msgid "Party prefix must be one character long."
+msgstr ""
+
+#: ../src/gui/chat.cpp:777
+msgid "Cannot use a '/' as the prefix."
+msgstr ""
+
+#: ../src/gui/chat.cpp:782
+msgid "Changing prefix to "
+msgstr ""
+
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: src/gui/chat.cpp:499
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: src/gui/chat.cpp:500
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: src/gui/chat.cpp:501
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: src/gui/chat.cpp:502
-msgid "/where: Display map name"
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
 msgstr ""
 
-#: src/gui/chat.cpp:503
-msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+#: ../src/gui/chat.cpp:799
+msgid "/msg <nick> <message>: Alternate form for /whisper"
+msgstr ""
+
+#: ../src/gui/chat.cpp:800
+msgid "/present: Get list of players present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
 msgstr ""
 
-#: src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:803
+msgid "/toggle: Determine whether <return> toggles the chat log."
+msgstr ""
+
+#: ../src/gui/chat.cpp:805
+msgid "/where: Display map name"
+msgstr ""
+
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: src/gui/chat.cpp:506
+#: ../src/gui/chat.cpp:807
+msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: src/gui/chat.cpp:507
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:512
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:513
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/gui/chat.cpp:514
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:520
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: src/gui/chat.cpp:521
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/gui/chat.cpp:527
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: src/gui/chat.cpp:528
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/gui/chat.cpp:530
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/gui/chat.cpp:531
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/gui/chat.cpp:536
+#: ../src/gui/chat.cpp:839
+msgid "Command: /present"
+msgstr ""
+
+#: ../src/gui/chat.cpp:840
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
+msgid "Command: /toggle <state>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:855
+msgid ""
+"This command sets whether the return key should toggle thechat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+
+#: ../src/gui/chat.cpp:858
+msgid ""
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
+msgstr ""
+
+#: ../src/gui/chat.cpp:861
+msgid "Command: /toggle"
+msgstr ""
+
+#: ../src/gui/chat.cpp:862
+msgid "This command displays the return toggle status."
+msgstr ""
+
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: src/gui/chat.cpp:537
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/gui/chat.cpp:543
+#: ../src/gui/chat.cpp:872
+msgid "Command: /msg <nick> <msg>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:544
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: src/gui/chat.cpp:545
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: src/gui/chat.cpp:547
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/gui/chat.cpp:553
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: src/gui/chat.cpp:554
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/gui/chat.cpp:558
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: src/gui/chat.cpp:559
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:35
+#: ../src/gui/colour.cpp:32
+msgid "GM"
+msgstr ""
+
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
+#: ../src/gui/colour.cpp:34
+msgid "Player"
+msgstr ""
+
+#: ../src/gui/colour.cpp:35
+msgid "Whisper"
+msgstr ""
+
+#: ../src/gui/colour.cpp:36
+msgid "Is"
+msgstr ""
+
+#: ../src/gui/colour.cpp:37
+msgid "Party"
+msgstr ""
+
+#: ../src/gui/colour.cpp:38
+msgid "Server"
+msgstr ""
+
+#: ../src/gui/colour.cpp:39
+msgid "Logger"
+msgstr ""
+
+#: ../src/gui/colour.cpp:40
+msgid "Hyperlink"
+msgstr ""
+
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr ""
 
-#: src/gui/confirm_dialog.cpp:36
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:49 src/gui/updatewindow.cpp:116
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:38 src/gui/menuwindow.cpp:62
+#: ../src/gui/emotecontainer.cpp:60
+msgid "Unable to load selection.png"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
+#: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
+msgid "Emote"
+msgstr ""
+
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
+msgid "Use"
+msgstr ""
+
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/help.cpp:33
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
+msgid "Unequip"
+msgstr ""
+
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:41
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:46 src/gui/menuwindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
+#: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:232
-#: src/gui/skill.cpp:134
-msgid "Use"
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
+msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:57
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:99
-#, c-format
-msgid "Weight: %d / %d"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:104
-#, c-format
-msgid "Slots used: %d / %d"
+#: ../src/gui/inventorywindow.cpp:84
+msgid "Slots: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:225
-msgid "Unequip"
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
+msgid "Weight: "
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:228
-msgid "Equip"
-msgstr ""
-
-#: src/gui/item_amount.cpp:76
+#: ../src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:80
+#: ../src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/login.cpp:42
+#: ../src/gui/itempopup.cpp:112
+msgid " grams"
+msgstr ""
+
+#: ../src/gui/login.cpp:49
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:45 src/gui/register.cpp:66
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr ""
 
-#: src/gui/login.cpp:50
-msgid "Remember Username"
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
+msgid "Port:"
 msgstr ""
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:75
+#: ../src/gui/login.cpp:55
+msgid "Recent:"
+msgstr ""
+
+#: ../src/gui/login.cpp:78
+msgid "Keep"
+msgstr ""
+
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:61
+#: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:64 src/gui/skill.cpp:119
+#: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:65
+#: ../src/gui/menuwindow.cpp:67 ../src/gui/menuwindow.cpp:117
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66 src/main.cpp:716
+#: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr ""
 
-#: src/gui/minimap.cpp:34
+#: ../src/gui/minimap.cpp:39 ../src/gui/minimap.cpp:43
 msgid "MiniMap"
 msgstr ""
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: ../src/gui/npcintegerdialog.cpp:33
+msgid "NPC Number Request"
+msgstr ""
+
+#: ../src/gui/npcintegerdialog.cpp:41
+msgid "Reset"
+msgstr ""
+
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:81
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: ../src/gui/npcstringdialog.cpp:33
+msgid "NPC Text Request"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: ../src/gui/popupmenu.cpp:78
+msgid "@@trade|Trade With "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: ../src/gui/popupmenu.cpp:79
+msgid "@@attack|Attack "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:85
+msgid "@@friend|Befriend "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:88
+msgid "@@disregard|Disregard "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:89
+msgid "@@ignore|Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
+msgid "@@unignore|Un-Ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:94
+msgid "@@ignore|Completely ignore "
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:106
+msgid "@@party-invite|Invite "
+msgstr ""
+
+#. NPCs can be talked to (single option, candidate for removal
+#. unless more options would be added)
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:140
-#: src/gui/popupmenu.cpp:293
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:283
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:285
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:288
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:290
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:291
-msgid "@@description|Description@@"
+#: ../src/gui/popupmenu.cpp:296
+msgid "@@chat|Add to Chat@@"
+msgstr ""
+
+#: ../src/gui/recorder.cpp:37
+msgid "Recorder"
+msgstr ""
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+msgid "Already recording."
 msgstr ""
 
-#: src/gui/register.cpp:67
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
+msgid "Recording..."
+msgstr ""
+
+#: ../src/gui/recorder.h:40
+msgid "Stop recording"
+msgstr ""
+
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:73
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: src/gui/register.cpp:74
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: src/gui/register.cpp:176
+#: ../src/gui/register.cpp:155
+#, c-format
+msgid "RegisterDialog::register Username is %s"
+msgstr ""
+
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:184
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:192
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:200
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:207
+#. Password does not match with the confirmation one
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/register.cpp:227 src/main.cpp:945
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:40
+#: ../src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:46
+#: ../src/gui/setup_audio.cpp:47
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:48
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:58
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup.cpp:79
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup.cpp:83
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup.cpp:87
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup.cpp:91
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup.cpp:95
+#: ../src/gui/setup.cpp:94
+msgid "Colors"
+msgstr ""
+
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:36 src/gui/setup_joystick.cpp:70
+#: ../src/gui/setup_colours.cpp:52
+msgid "Red: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:66
+msgid "Green: "
+msgstr ""
+
+#: ../src/gui/setup_colours.cpp:80
+msgid "Blue: "
+msgstr ""
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:68
+#: ../src/gui/setup_joystick.cpp:39 ../src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
+#: ../src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:73
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:74
+#: ../src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:88
+#: ../src/gui/setup_keyboard.cpp:87
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:91
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:115
+#: ../src/gui/setup_keyboard.cpp:120
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:116
+#: ../src/gui/setup_keyboard.cpp:121
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: src/gui/setup_players.cpp:53
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
+msgid "???"
+msgstr ""
+
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:245
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: ../src/gui/setup_video.cpp:92
+msgid "No modes available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:94
+msgid "All resolutions available"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:117
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: ../src/gui/setup_video.cpp:118
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: ../src/gui/setup_video.cpp:119
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
+#: ../src/gui/setup_video.cpp:120
+msgid "Particle effects"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:121
+msgid "Speech bubbles"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:122
+msgid "Show name"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:124
 msgid "FPS Limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:145
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:146
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_video.cpp:200
+#: ../src/gui/setup_video.cpp:147
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_video.cpp:208
+#: ../src/gui/setup_video.cpp:148
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:412
+#: ../src/gui/setup_video.cpp:149
+msgid "Particle Detail"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218 src/gui/setup_video.cpp:234
-#: src/gui/setup_video.cpp:415 src/gui/setup_video.cpp:429
+#: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221 src/gui/setup_video.cpp:240
-#: src/gui/setup_video.cpp:418 src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Particle Detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:237 src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:243 src/gui/setup_video.cpp:438
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:309
+#: ../src/gui/setup_video.cpp:303
+msgid "Failed to switch to "
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:304
+msgid "windowed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:304
+msgid "fullscreen"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:305
+msgid "mode and restoration of old mode also failed!"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:312
 msgid "Switching to full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310
+#: ../src/gui/setup_video.cpp:313
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#. OpenGL can currently only be changed by restarting, notify user.
+#: ../src/gui/setup_video.cpp:325
 msgid "Changing OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
+#: ../src/gui/setup_video.cpp:326
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/skill.cpp:79
-msgid "Mystery Skill"
+#. TODO: Find out why the drawing area doesn't resize without a restart.
+#: ../src/gui/setup_video.cpp:398
+msgid "Screen resolution changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:399
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/skill.cpp:132 src/gui/skill.cpp:188
+#: ../src/gui/setup_video.cpp:417
+msgid "Particle effect settings changed"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:418
+msgid "Restart your client or change maps for the change to take effect."
+msgstr ""
+
+#: ../src/gui/skill.cpp:41
+msgid "skills.xml"
+msgstr ""
+
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:133
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: ../src/gui/skill.cpp:143
+msgid "inc"
+msgstr ""
+
+#: ../src/gui/skill.cpp:144
+msgid "use"
+msgstr ""
+
+#: ../src/gui/skill.cpp:262
+#, c-format
+msgid "Error loading skills file: %s"
+msgstr ""
+
+#: ../src/gui/speechbubble.cpp:35
+msgid "Speech"
+msgstr ""
+
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: src/gui/status.cpp:127
+#: ../src/gui/status.cpp:54
+msgid "HP:"
+msgstr ""
+
+#: ../src/gui/status.cpp:57
+msgid "Exp:"
+msgstr ""
+
+#: ../src/gui/status.cpp:60
+msgid "MP:"
+msgstr ""
+
+#: ../src/gui/status.cpp:63
+msgid "Job:"
+msgstr ""
+
+#. ----------------------
+#. Stats Part
+#. ----------------------
+#. Static Labels
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr ""
 
-#: src/gui/status.cpp:128
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: src/gui/status.cpp:129
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
-#: src/gui/status.cpp:132
+#. Derived Stats
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:133
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:134
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: src/gui/status.cpp:135
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: src/gui/status.cpp:136
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr ""
 
-#: src/gui/status.cpp:283
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr ""
 
-#: src/gui/status.cpp:284
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr ""
 
-#: src/gui/status.cpp:285
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr ""
 
-#: src/gui/status.cpp:286
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr ""
 
-#: src/gui/status.cpp:287
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:61
-msgid "Add"
+#: ../src/gui/trade.cpp:49
+msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:64
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:80 src/gui/trade.cpp:156 src/gui/trade.cpp:204
+#: ../src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: src/gui/trade.cpp:81
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:283
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:93
+#: ../src/gui/updatewindow.cpp:78
+#, c-format
+msgid "Couldn't load text file: %s"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:93
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:119
+#: ../src/gui/updatewindow.cpp:115
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:525
+#: ../src/gui/updatewindow.cpp:196
+msgid "Couldn't load news"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:327
+msgid "curl error "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:328
+msgid " host: "
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:363
+#, c-format
+msgid "Checksum for file %s failed: (%lx/%lx)"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:413
+msgid "Unable to create mThread"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:451
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:452
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:453
+msgid "##1  you try again later"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:507
+#, c-format
+msgid "%s already here"
+msgstr ""
+
+#: ../src/gui/updatewindow.cpp:520
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
+#: ../src/net/playerhandler.cpp:193 ../src/net/playerhandler.cpp:248
+msgid "Message"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:194
+msgid ""
+"You are carrying more then half your weight. You are unable to regain health."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:218
+msgid "You are dead."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:219
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:220
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:221
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:222
+msgid "Game Over!"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:223
+msgid "Insert coin to continue"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:224
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:225
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:226
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:227
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#. Nethack reference
+#: ../src/net/playerhandler.cpp:228
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#. Secret of Mana reference
+#: ../src/net/playerhandler.cpp:229
+msgid "Annihilated."
+msgstr ""
+
+#. Final Fantasy VI reference
+#: ../src/net/playerhandler.cpp:230
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#. Earthbound reference
+#: ../src/net/playerhandler.cpp:231
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#. Leisure Suit Larry 1 Reference
+#: ../src/net/playerhandler.cpp:232
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#. Monty Python reference from a couple of skits
+#: ../src/net/playerhandler.cpp:233
+msgid "You are no more."
+msgstr ""
+
+#. Monty Python reference from the dead parrot sketch starting now
+#: ../src/net/playerhandler.cpp:234
+msgid "You have ceased to be."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:235
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:236
+msgid "You're a stiff."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:237
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:238
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:239
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:240
+msgid "You're off the twig."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:241
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:242
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:243
+msgid "You are an ex-player."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:244
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:390
+msgid "Equip arrows first"
+msgstr ""
+
+#: ../src/net/playerhandler.cpp:394
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+msgid " cancelled"
+msgstr ""
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:52
+msgid "Initializing emote database..."
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:59
+msgid "Emote Database: Error while loading emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:72
+msgid "Emote Database: Emote with missing ID in emotes.xml!"
+msgstr ""
+
+#: ../src/resources/emotedb.cpp:131
+#, c-format
+msgid "EmoteDB: Warning, unknown emote ID %d requested"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:54
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:62
+msgid "items.xml"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:67
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:79
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:84
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: src/main.cpp:769
+#: ../src/resources/itemdb.cpp:140
+#, c-format
+msgid "ItemDB: Duplicate name of item found item %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:166
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:184
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:240
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:48
+msgid "monsters.xml"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
+#: ../src/game.cpp:390
+msgid "Screenshot saved to ~/"
+msgstr ""
+
+#: ../src/game.cpp:395
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: ../src/game.cpp:396
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: ../src/game.cpp:471
+msgid "Network Error"
+msgstr ""
+
+#: ../src/game.cpp:472
+msgid "The connection to the server was lost, the program will now quit"
+msgstr ""
+
+#: ../src/game.cpp:591
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:734
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
+msgid "Sit"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:72
+msgid "Status Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:73
+msgid "Inventory Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:74
+msgid "Equipment WIndow"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+msgid "Select OK"
+msgstr ""
+
+#: ../src/main.cpp:214
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:215
+msgid "Invalid update host: "
+msgstr ""
+
+#: ../src/main.cpp:221
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: ../src/main.cpp:246
+#, c-format
+msgid "Error: %s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:248 ../src/main.cpp:254
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: ../src/main.cpp:252
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
+msgstr ""
+
+#: ../src/main.cpp:283
+msgid " can't be created, but it doesn't exist! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:292
+#, c-format
+msgid "Starting Aethyra Version %s"
+msgstr ""
+
+#: ../src/main.cpp:294
+msgid "Starting Aethyra - Version not defined"
+msgstr ""
+
+#. Initialize SDL
+#: ../src/main.cpp:298
+msgid "Initializing SDL..."
+msgstr ""
+
+#: ../src/main.cpp:300
+msgid "Could not initialize SDL: "
+msgstr ""
+
+#: ../src/main.cpp:313
+msgid " couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: ../src/main.cpp:333
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr ""
+
+#. Fill configuration with defaults
+#: ../src/main.cpp:343
+msgid "Initializing configuration..."
+msgstr ""
+
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
+#: ../src/main.cpp:499
+msgid "aethyra"
+msgstr ""
+
+#: ../src/main.cpp:500
+msgid "Options: "
+msgstr ""
+
+#: ../src/main.cpp:501
+msgid "  -C --configfile : Configuration file to use"
+msgstr ""
+
+#: ../src/main.cpp:502
+msgid "  -d --data       : Directory to load game data from"
+msgstr ""
+
+#: ../src/main.cpp:503
+msgid "  -D --default    : Bypass the login process with default settings"
+msgstr ""
+
+#: ../src/main.cpp:504
+msgid "  -h --help       : Display this help"
+msgstr ""
+
+#: ../src/main.cpp:505
+msgid "  -H --updatehost : Use this update host"
+msgstr ""
+
+#: ../src/main.cpp:506
+msgid "  -p --playername : Login with this player"
+msgstr ""
+
+#: ../src/main.cpp:507
+msgid "  -P --password   : Login with this password"
+msgstr ""
+
+#: ../src/main.cpp:508
+msgid "  -u --skipupdate : Skip the update downloads"
+msgstr ""
+
+#: ../src/main.cpp:509
+msgid "  -U --username   : Login with this username"
+msgstr ""
+
+#: ../src/main.cpp:510
+msgid "  -v --version    : Display the version"
+msgstr ""
+
+#: ../src/main.cpp:516 ../src/main.cpp:519
+msgid "Aethyra version "
+msgstr ""
+
+#: ../src/main.cpp:520
+msgid "(local build?, PACKAGE_VERSION is not defined)"
+msgstr ""
+
+#: ../src/main.cpp:616
+msgid "Trying to connect to account server..."
+msgstr ""
+
+#: ../src/main.cpp:617
+#, c-format
+msgid "Username is %s"
+msgstr ""
+
+#: ../src/main.cpp:671
+msgid "Trying to connect to char server..."
+msgstr ""
+
+#: ../src/main.cpp:693
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr ""
+
+#: ../src/main.cpp:699
+msgid "Trying to connect to map server..."
+msgstr ""
+
+#: ../src/main.cpp:700
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: ../src/main.cpp:830
+#, c-format
+msgid "Couldn't load %s as wallpaper"
+msgstr ""
+
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr ""
 
-#: src/main.cpp:964
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
+
+#: ../src/party.cpp:55
+msgid "Not yet implemented!"
+msgstr ""
+
+#: ../src/party.cpp:64
+msgid "Party command not known."
+msgstr ""
+
+#: ../src/party.cpp:71
+msgid "Party name is missing."
+msgstr ""
+
+#: ../src/party.cpp:84
+msgid "Left party."
+msgstr ""
+
+#: ../src/party.cpp:92
+msgid "Party successfully created."
+msgstr ""
+
+#: ../src/party.cpp:97
+msgid "Could not create party."
+msgstr ""
+
+#: ../src/party.cpp:106
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: ../src/party.cpp:110
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: ../src/party.cpp:114
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: ../src/party.cpp:126
+msgid "You can't have a blank party name!"
+msgstr ""
+
+#: ../src/party.cpp:130
+msgid "Invite to party"
+msgstr ""
+
+#: ../src/party.cpp:131
+#, c-format
+msgid "%s invites you to join the %s party, do you accept?"
+msgstr ""
+
+#: ../src/party.cpp:149
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: ../src/party.cpp:161
+msgid "Party chat received, but being is not a player"
+msgstr ""
+
+#: ../src/party.cpp:173
+msgid "Command: /party <command> <args>"
+msgstr ""
+
+#: ../src/party.cpp:174
+msgid "where <command> can be one of:"
+msgstr ""
+
+#: ../src/party.cpp:175
+msgid "   /new"
+msgstr ""
+
+#: ../src/party.cpp:176
+msgid "   /create"
+msgstr ""
+
+#: ../src/party.cpp:177
+msgid "   /prefix"
+msgstr ""
+
+#: ../src/party.cpp:178
+msgid "   /leave"
+msgstr ""
+
+#: ../src/party.cpp:179
+msgid "This command implements the partying function."
+msgstr ""
+
+#: ../src/party.cpp:181
+msgid "Type /help party <command> for further help."
+msgstr ""
+
+#: ../src/party.cpp:187
+msgid "Command: /party new <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:188
+msgid "Command: /party create <party-name>"
+msgstr ""
+
+#: ../src/party.cpp:189
+msgid "These commands create a new party <party-name."
+msgstr ""
+
+#: ../src/party.cpp:195
+msgid "Command: /party prefix <prefix-char>"
+msgstr ""
+
+#: ../src/party.cpp:196
+msgid "This command sets the party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:198
+msgid ""
+"Any message preceded by <prefix-char> is sent to the party instead of "
+"everyone."
+msgstr ""
+
+#: ../src/party.cpp:200
+msgid "Command: /party prefix"
+msgstr ""
+
+#: ../src/party.cpp:201
+msgid "This command reports the current party prefix character."
+msgstr ""
+
+#: ../src/party.cpp:209
+msgid "Command: /party leave"
+msgstr ""
+
+#: ../src/party.cpp:210
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: ../src/party.cpp:214
+msgid "Unknown /party command."
+msgstr ""
+
+#: ../src/party.cpp:215
+msgid "Type /help party for a list of options."
+msgstr ""
diff --git a/po/ar.po b/po/ar.po
index bb59b0a8..67994789 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-07-16 18:28+0000\n"
 "Last-Translator: صقر بن عبدالله <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "شراء"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "السعر: %d GP / الإجمالي: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "مغادرة"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "الوصف: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "التأثير: %s"
@@ -49,34 +50,34 @@ msgstr "التأثير: %s"
 msgid "Shop"
 msgstr "إيقاف"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "بيع"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "إنتقاء الشخصيّة"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "الاسم: %s"
@@ -86,420 +87,449 @@ msgstr "الاسم: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "المستوى: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "النقود: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "جديد"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "حذف"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "السّابق"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "التّالي"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "موافق"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "الاسم:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "لون الشعر:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "قصّة الشعر:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "إنشاء"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "إنتقاء الشخصيّة"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "إنشاء"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "تغيير OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "مرتفع"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -530,15 +560,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "نعم"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "لا"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
@@ -546,66 +576,66 @@ msgstr "جارِ الاتّصال..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "استخدام"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "العتاد"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "الجردة"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "إسقاط"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -613,11 +643,11 @@ msgstr ""
 msgid "Login"
 msgstr "ولوج"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "المنفذ:"
 
@@ -625,22 +655,22 @@ msgstr "المنفذ:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "ترك"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "تسجيل"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "الحالة"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "مهارات"
 
@@ -649,7 +679,7 @@ msgid "Shortcut"
 msgstr "اختصار"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "تثبيت"
 
@@ -657,146 +687,180 @@ msgstr "تثبيت"
 msgid "MiniMap"
 msgstr "خارطة صغيرة"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "تسجيل"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@تجارة|متاجرة مع %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@مهاجمة|هاجم %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@محادثة|تحدّث مع NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@إلغاء|إلغاء@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@اقتطاف|اقتطاف %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@استخدم|استخدم@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@إسقاط|إسقاط@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "جارِ الاتّصال..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "جارِ الاتّصال..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "تأكيد:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "خطأ"
 
@@ -812,47 +876,47 @@ msgstr "حجم صوت المؤثرّات"
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "تطبيق"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "تصفير النوافذ"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "مرئية"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "سمعيّ"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "عصا الألعاب"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -893,48 +957,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "الاسم:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -994,25 +1058,25 @@ msgstr "مؤثّرات محيطة"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "واقف"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "منخفض"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "مرتفع"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1050,29 +1114,21 @@ msgstr "تغيير OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
@@ -1082,44 +1138,44 @@ msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 msgid "skills.xml"
 msgstr "مهارات"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "استخدام"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "المستوى: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "النقود: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1127,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "المستوى: %d"
@@ -1140,110 +1196,110 @@ msgstr "المستوى: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "الحالة"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "مهاجمة %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "دفاع %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "مهاجمة %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "دفاع %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "القوّة:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "خفّة الحركة:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "نشاط:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "ذكاء:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "المهارة:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "إضافة"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "أنت تحصل على %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1549,50 +1605,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1666,201 +1718,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+msgid "Attack"
+msgstr "مهاجمة %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "مهاجمة %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "تصفير النوافذ"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "قسم"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "اختصار"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "تصفير النوافذ"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "الحالة"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "الجردة"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "العتاد"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "تصفير النوافذ"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "تصفير النوافذ"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "تصفير النوافذ"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "تصفير النوافذ"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "اختصار"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "إنتقاء الشخصيّة"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "الاسم: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "جارِ الاتّصال..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1926,90 +2151,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "إنشاء"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2038,9 +2259,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "رجاء حذف %d نقطة"
 
-#~ msgid "Split"
-#~ msgstr "قسم"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "انتقاء كمّيّة من المواد لقسمها."
 
diff --git a/po/ca.po b/po/ca.po
index 2819a9a8..15966072 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "preu %d GP / total %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "sortir"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr ""
@@ -48,34 +49,34 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr ""
@@ -85,418 +86,446 @@ msgstr ""
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "nom"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "canvi"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -525,15 +554,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "si"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "no"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr ""
 
@@ -541,66 +570,66 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -608,11 +637,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr ""
 
@@ -620,22 +649,22 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr ""
 
@@ -644,7 +673,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr ""
 
@@ -652,141 +681,173 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr ""
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+msgid "Recorder"
+msgstr ""
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+msgid "Already recording."
+msgstr ""
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 msgid "Recording..."
 msgstr ""
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr ""
 
@@ -802,47 +863,47 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr ""
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -882,48 +943,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "nom"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -983,25 +1044,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1038,28 +1099,20 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1067,43 +1120,43 @@ msgstr ""
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1111,11 +1164,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 msgid "Job:"
 msgstr ""
 
@@ -1123,100 +1176,100 @@ msgstr ""
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr ""
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr ""
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr ""
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr ""
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr ""
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr ""
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1521,50 +1574,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1638,196 +1687,356 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
-msgid "Are you sure you want to quit?"
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
+msgid "Sit"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
 msgstr ""
 
-#: ../src/game.cpp:784
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
 #, c-format
-msgid "Warning: guichan input exception: %s"
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:72
+msgid "Status Window"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:73
+msgid "Inventory Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:74
+msgid "Equipment WIndow"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
 #, c-format
-msgid "Error: Invalid update host: %s"
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+msgid "Select OK"
 msgstr ""
 
 #: ../src/main.cpp:214
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1892,88 +2101,84 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 msgid "   /create"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 65af46ff..590d1f34 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Nákup"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr ""
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr ""
@@ -48,35 +49,35 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Prodej"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Potvrďte vymazání postavy"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvořit postavu"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Jméno: %s"
@@ -86,419 +87,447 @@ msgstr "Jméno: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Úroveň: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Peníze: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Nová"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Další"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Jméno:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Barva vlasů:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Styl vlasů:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Vytvořit"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Server:"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Vytvořit"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -529,15 +558,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Ano"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Ne"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
@@ -545,66 +574,66 @@ msgstr "Připojuji se..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventář"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Vybavit"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Upustit"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -612,11 +641,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -624,22 +653,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registrace"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Stav"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -648,7 +677,7 @@ msgid "Shortcut"
 msgstr "Zkratka"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Nastavení"
 
@@ -656,143 +685,177 @@ msgstr "Nastavení"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registrace"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr ""
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Připojuji se..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Připojuji se..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Připojuji se..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Muž"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Žena"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Uživatelské jméno musí být kratší než %d znaků."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí být kratší než %d znaků."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Chyba"
 
@@ -808,47 +871,47 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Klávesnice"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -889,48 +952,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Jméno:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -990,25 +1053,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1045,28 +1108,20 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1075,43 +1130,43 @@ msgstr ""
 msgid "skills.xml"
 msgstr "Dovednosti"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Úroveň: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peníze: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1119,11 +1174,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Úroveň: %d"
@@ -1132,109 +1187,109 @@ msgstr "Úroveň: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Stav"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Útok %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Obrana %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Útok %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Obrana %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Síla:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Vitalita:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalita:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligence:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr ""
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1540,50 +1595,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1657,201 +1708,368 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
+msgid "Attack"
+msgstr "Útok %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Útok %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Rozdělit"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Zkratka"
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Stav"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventář"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Vybavení"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Zkratka"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Server:"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Jméno: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Připojuji se..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1917,90 +2135,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Vytvořit"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2032,9 +2246,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Odstraňte prosím %d bodů."
 
-#~ msgid "Split"
-#~ msgstr "Rozdělit"
-
 #~ msgid "Guilds"
 #~ msgstr "Gildy"
 
diff --git a/po/da.po b/po/da.po
index 5e9fd19e..de4e3525 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Køb"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Afslut"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
@@ -49,34 +50,34 @@ msgstr "Effekt: %s"
 msgid "Shop"
 msgstr "Butik"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Sælg"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bekræft sletning af karakter"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakter?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Vælg Karakter"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Navn: %s"
@@ -86,348 +87,356 @@ msgstr "Navn: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Penge: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Opret"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Slet"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Næste"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr "Guld: %d"
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Lav Bruger"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Hårfarve:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Frisure:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Opret"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Vælg Server"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr "OK"
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 #, fuzzy
 msgid "Global announcement: "
 msgstr "Global meddelelse: "
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, fuzzy, c-format
 msgid "Global announcement from %s: "
 msgstr "Global meddelelse fra %s: "
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr "Prøver at sende en blank gruppe besked."
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr "Ukendt genstand"
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
 "\"."
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 #, fuzzy
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr "Ukendt gruppe kommando... Skriv \"/help party\" for mere information."
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr "Trylleformularen findes ikke!"
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr "Den nuværende server understøtter ikke trylleformulare"
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr "Til stede: "
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr "Fremmøde skrives til loggen"
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr "Handel fejlede!"
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr "Emote fejlede!"
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr "Sæt dig fejlede!"
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr "Chat skabelsen fejlede!"
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr "Kan ikke råbe!"
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du er ikke nået til det rette Niveau endnu!"
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr "Utilstrækkelig HP!"
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr "Utilstrækkelig SP!"
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr "Du har ingen memorandaer!"
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr "Det kan du ikke gøre lige nu!"
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Det ser ud til at du har behov for flere Zeny... ;-)"
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan ikke bruge denne færdighed med dette slags våben!"
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr "Du har behov for en rød krystal mere"
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr "Du har behov for en blå krystal mere"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr "Du har for meget på dig, til at kunne gøre dette"
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr "Hmm? Hvad er det?"
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr "Warp mislykkede..."
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr "Kunne ikke stjæle noget som helst..."
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr "Det nuværende gruppe præfiks er "
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr "Gruppens præfiks skal være et bogstav langt. "
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr "Kan ikke bruge '/' som præfikset"
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ændre præfikset til "
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr "--Hjælp--"
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: Global meddelelse (Kun for GM)"
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr "/clear: Rydder dette vindue"
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr "/help: Viser denne hjælp"
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr "/msg <navn> <besked>: Alternativ form for /whisper"
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr "/present: Får listen af tilstedeværende brugere"
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr "/toggle: Bestemmer om <retur> bringer focus på chat loggen."
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr "/where: Viser bane navnet"
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <navn> <besked>: Kort form for /whisper"
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 "/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn"
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr "/who: Viser antalet af online brugere"
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr "For at få mere information, skriv /help <kommando>"
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <besked>"
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgængelig for en GM ***"
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne commando rydder chat loggen"
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -436,11 +445,31 @@ msgstr ""
 "lytteradius, og sender listen til enten record loggen, hvis du optager, "
 "ellers er det chat loggen."
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+#, fuzzy
+msgid "Command: /record <filename>"
+msgstr "Kommando: /clear"
+
+#: ../src/gui/chat.cpp:847
+#, fuzzy
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Denne commando rydder chat loggen"
+
+#: ../src/gui/chat.cpp:849
+#, fuzzy
+msgid "Command: /record"
+msgstr "Kommando: /clear"
+
+#: ../src/gui/chat.cpp:850
+#, fuzzy
+msgid "This command finishes a recording session."
+msgstr "Denne kommando viser hjælp for <kommando>"
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 #, fuzzy
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
@@ -449,7 +478,7 @@ msgstr ""
 "Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
 "loggen, ellerom chat om chat loggen, automatisk skal slå fra."
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -458,63 +487,68 @@ msgstr ""
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr "kommando: /where"
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr "Kommando: /msg <navn> <besked>"
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr "Kommando: /whisper <navn> <besked>"
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr "Denne kommando sender beskeden <besked> til <navn>."
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Hvis navnet har mellemrum i det, skal det omringes med følgende (\")."
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der nuværende er online."
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr "GM"
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "høj"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr "Bruger"
@@ -545,15 +579,15 @@ msgstr "Logger"
 msgid "Hyperlink"
 msgstr "Hyperlink"
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Nej"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
@@ -561,67 +595,67 @@ msgstr "Opretter forbindelse..."
 msgid "Unable to load selection.png"
 msgstr "Kan ikke loade valgte-billede.png"
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr "Emote"
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Brug"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Tag af"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr "Luk"
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Tag på"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Smid"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 #, fuzzy
 msgid "Slots: "
 msgstr " g Pladser: "
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../src/gui/item_amount.cpp:75
+#: ../src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande 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 genstande du vil smide."
 
-#: ../src/gui/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -629,11 +663,11 @@ msgstr ""
 msgid "Login"
 msgstr "Log Ind"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -641,22 +675,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr "Nuværende:"
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Behold"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registrer"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Færdigheder"
 
@@ -665,7 +699,7 @@ msgid "Shortcut"
 msgstr "Genvej"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -673,146 +707,181 @@ msgstr "Opsætning"
 msgid "MiniMap"
 msgstr "MiniKort"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Nuværende:"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Byt Med "
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Angrib "
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr "@@friend|Bliv ven med "
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr "@@disregard|Se bort fra "
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr "@@ignore|Bloker "
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr "@@unignore|Fjern blokering "
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr "@@ignore|Bloker fuldstændig "
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr "@@party-invite|Inviter "
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Snak Til NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Saml Op %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Tag af@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Tag på@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Brug@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Smid@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Opretter forbindelse..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Opretter forbindelse..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+#, fuzzy
+msgid "Failed to start recording."
+msgstr "Fejlede i at skifte til "
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Opretter forbindelse..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Bekræft:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Mand"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Kvinde"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr "RegisterDialog::register Brugernavn er %s"
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Fejl"
 
@@ -828,49 +897,49 @@ msgstr "Lydstyrke på effekter"
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Anvend"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Nulstil Vinduer"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 #, fuzzy
 msgid "Colors"
 msgstr "Farver:"
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr "Brugere"
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 #, fuzzy
 msgid "Green: "
 msgstr "Til stede: "
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -911,48 +980,48 @@ msgstr "Tast Konfikt(er) Opdaget."
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Navn:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr "Relation"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr "Ven"
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr "Se bort fra"
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr "Ignorer"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr "???"
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr "Gem bruger liste"
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr "Tillad handel"
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr "Når ignorer:"
 
@@ -1012,25 +1081,25 @@ msgstr "Omgivende FX"
 msgid "Particle Detail"
 msgstr "Partikel Detalje"
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "fra"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "lav"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "høj"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr "mellem"
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr "maks"
 
@@ -1068,29 +1137,21 @@ msgstr "Skrifter til OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr "Kunne ikke definere "
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr " skærm opsætning: "
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr "Skærm opløsning ændret"
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr "Partikel effekt opsætningen er ændret"
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane."
@@ -1099,45 +1160,45 @@ msgstr "Ændringerne kræver at du genstarter klienten, eller skifter bane."
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr "Færdigheds points: %d"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr "Op"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr "inc"
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Brug"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr "Fejl under loading af færdigheds fil: %s"
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 #, fuzzy
 msgid "Speech"
 msgstr "Snakke"
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Karriere: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Penge: %d GP"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1145,11 +1206,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Karriere: %d"
@@ -1158,110 +1219,110 @@ msgstr "Karriere: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr "Total"
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr "Pris"
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Angrib:"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Forsvar:"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "M.Angrib:"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "M.Forsvar:"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, fuzzy, c-format
 msgid "% Accuracy:"
 msgstr "% Nøjagtighed:"
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, fuzzy, c-format
 msgid "% Evade:"
 msgstr "% Undvig:"
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr "% Refleks:"
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Styrke"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Adræthed"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Helbred"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligens"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Behændighed"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr "Held"
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "Tilgode Status Points: %d"
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr "Handel"
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tilføj"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du giver:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
@@ -1577,50 +1638,46 @@ msgstr "Emote Database: Emote med manglende ID i emotes.xml!"
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr "EmoteDB: Warning, unknown emote ID %d requested"
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr "Startede genstans database..."
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr "Ukendt genstand"
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr "ItemDB: Fejl under læsningen af items.xml!"
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr "ItemDB: Ugyldig eller manglende genstand ID i items.xml!"
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr "ItemDB: Ny definition af genstand ID %d"
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr "Unavngivet"
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr "Udlæser genstands databasen..."
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr "ItemDB: Fejl, ukendt genstand ID# %d"
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr "ItemDB: Ignorerer ukendt lyd begivenhed '%s'"
@@ -1696,202 +1753,379 @@ msgstr "Netværk Fejl"
 msgid "The connection to the server was lost, the program will now quit"
 msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
-#: ../src/game.cpp:535
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorer indkomne handels anmodninger"
-
-#: ../src/game.cpp:542
-msgid "Accepting incoming trade requests"
-msgstr "Accepter indkomne handels anmodninger"
-
-#: ../src/game.cpp:637
+#: ../src/game.cpp:591
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du gerne vil stoppe?"
 
-#: ../src/game.cpp:644
+#: ../src/game.cpp:598
 msgid "no"
 msgstr "nej"
 
-#: ../src/game.cpp:784
+#: ../src/game.cpp:727
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorer indkomne handels anmodninger"
+
+#: ../src/game.cpp:734
+msgid "Accepting incoming trade requests"
+msgstr "Accepter indkomne handels anmodninger"
+
+#: ../src/game.cpp:770
 #, c-format
 msgid "Warning: guichan input exception: %s"
 msgstr "Advarsel: guichan indput untagelse: %s"
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "Attack"
+msgstr "Angrib:"
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Talk"
+msgstr "Total"
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Angrib:"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "Target Player"
+msgstr "Bruger"
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Nulstil Vinduer"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Opdel"
+
+#: ../src/keyboardconfig.cpp:56
+#, fuzzy
+msgid "Screenshot"
+msgstr "Skærmbillede gemt under ~/"
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Genvej"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Nulstil Vinduer"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventarliste"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Udstyr"
+
+#: ../src/keyboardconfig.cpp:75
+#, fuzzy
+msgid "Skill Window"
+msgstr "Færdigheds points: %d"
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Nulstil Vinduer"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Nulstil Vinduer"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Nulstil Vinduer"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Emote fejlede!"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Genvej"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Vælg Server"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr "Fejl: Ugyldigt opdaterings host: %s"
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr "Ugyldigt opdaterings host: "
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr "Advarsel: ingen protocol var aktiv som opdate host"
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr "Fejl: %s kan ikke laves, men findes ikke!"
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr "Fejl: %s/%s kan ikke laves, men findes ikke!"
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr " kan ikke laves, men det findes ikke! Lukker."
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr "Starter Aethyra Version %s"
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr "Starter Aethyra - Version er ikke defineret"
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr "Starter SDL..."
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr "Kunne ikke starte SDL: "
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr " kunne ikke blive sat til hjemmemappen! Lukker."
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr "Kan ikke finde ressourcernes mappe\n"
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr "Starter configurationen..."
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr "Kunne ikke definere "
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr " skærm opsætning: "
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr "Advarsel: %s"
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr "aethyra"
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr "Opsætning: "
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr "  -C --configfile : Configurations fil til brug"
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr "  -d --data       : Mappen at indlæse spillets data fra"
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 "  -D --default    : Overskriv login processen med normale indstillinger"
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr "  -h --help       : Viser denne hjælp"
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr "  -H --updatehost : Brug denne opdaterings host"
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr "  -p --playername : Logind med denne bruger"
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr "  -P --password   : Logind med denne adgangskode"
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr "  -u --skipupdate : Spring opdateringerne over"
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr "  -v --version    : Viser den nuværende version"
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr "Aethyra version "
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr "(lokalt build?, PACKAGE_VERSION er ikke defineret)"
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Prøver at opretter forbindelse til bruger serveren..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr "Brugernavn er %s"
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Prøver at oprette forbindelse til karakter serveren..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr "Husk den valgte karakter %s"
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Prøver at oprette forbindelse til bane serveren..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Bane; %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr "Kunne ikke indlæse %s som background"
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Opretter forbindelse til bane serveren..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr "Opretter forbindelse til karakter serveren..."
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr "Opretter forbindelse til bruger serveren..."
 
@@ -1958,104 +2192,103 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 #, fuzzy
 msgid "Command: /party <command> <args>"
 msgstr "Kommando: /help <kommando>"
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Opret"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 #, fuzzy
 msgid "This command implements the partying function."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 #, fuzzy
 msgid "Command: /party new <party-name>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 #, fuzzy
 msgid "Command: /party create <party-name>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 #, fuzzy
 msgid "This command sets the party prefix character."
 msgstr "Denne commando rydder chat loggen"
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 #, fuzzy
 msgid "Command: /party prefix"
 msgstr "Kommando: /present"
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 #, fuzzy
 msgid "This command reports the current party prefix character."
 msgstr "Denne commando rydder chat loggen"
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 #, fuzzy
 msgid "Command: /party leave"
 msgstr "Kommando: /present"
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 #, fuzzy
 msgid "This command causes the player to leave the party."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 #, fuzzy
 msgid "Unknown /party command."
 msgstr "Ukendt kommando"
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 #, fuzzy
 msgid "Type /help party for a list of options."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
+#~ msgid "The current server doesn't support spells"
+#~ msgstr "Den nuværende server understøtter ikke trylleformulare"
+
 #, fuzzy
 #~ msgid "Weight: %d  g / %d g"
 #~ msgstr "Vægt: %d  g / %d g"
@@ -2134,9 +2367,6 @@ msgstr "Skriv /help for at få en liste med kommandoer"
 #~ msgid "Please remove %d points"
 #~ msgstr "Du skal fjerne %d points"
 
-#~ msgid "Split"
-#~ msgstr "Opdel"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Vælg hvor mange genstande du vil opdele."
 
diff --git a/po/de.po b/po/de.po
index 816e209f..e5cf7a96 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2009-01-19 20:15+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: German\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Kaufen"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preis: %d GP / Summe: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Beenden"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
@@ -48,34 +49,34 @@ msgstr "Effekt: %s"
 msgid "Shop"
 msgstr "Geschäft"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 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:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Spielfigur auswählen"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
@@ -85,419 +86,449 @@ msgstr "Name : %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Neu"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Zurück"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Weiter"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr "Gold: %d"
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Name :"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Haarfarbe"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Frisur"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Erstellen"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr "Server auswählen"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr "Ok"
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Erstellen"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+#, fuzzy
+msgid "Unknown item"
+msgstr "Unbekannter Befehl"
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr "Handel fehlgeschlagen!"
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr "Emote fehlgeschlagen!"
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr "Sitzen fehlgeschlagen!"
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr "Chat-Erstellung fehlgeschlagen!"
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr "Du kannst dies momentan nicht tun!"
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Schmalhans ist dein Küchenmeister... ;-)"
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr "Du brauchst noch einen roten Edelstein!"
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr "Du brauchst noch einen blauen Edelstein!"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr "Du schleppst zuviel herum um das zu machen!"
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr "Eha? Was ist das?"
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr "Warp fehlgeschlagen..."
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr "Konnte nichts stehlen..."
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr "Das Gift hatte keine Wirkung..."
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ändere OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "Hoch"
+
 #: ../src/gui/colour.cpp:34
 #, fuzzy
 msgid "Player"
@@ -530,15 +561,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Nein"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Verbinde..."
 
@@ -546,66 +577,66 @@ msgstr "Verbinde..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Benutzen"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr "Schließen"
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventar"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -613,11 +644,11 @@ msgstr ""
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -625,22 +656,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Erinnern"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registrieren"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Fertigkeiten"
 
@@ -649,7 +680,7 @@ msgid "Shortcut"
 msgstr "Tastenkürzel"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -657,145 +688,179 @@ msgstr "Einstellungen"
 msgid "MiniMap"
 msgstr "Übersichtskarte"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registrieren"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Mit %s handeln@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|%s angreifen@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Mit NSC reden@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Abbrechen@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s aufheben@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Nutzen@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Fallen lassen@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Verbinde..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Verbinde..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Verbinde..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Männlich"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Weiblich"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Das Passwort muss aus mindestens %d bestehen."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Fehler"
 
@@ -811,48 +876,48 @@ msgstr "Lautstärke der Klangeffekte"
 msgid "Music volume"
 msgstr "Latustärke der Musik"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Anwenden"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 #, fuzzy
 msgid "Colors"
 msgstr "Schließen"
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr "Spieler"
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -892,47 +957,47 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr "Name"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr "Beziehung"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr "Freund"
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr "Spielerliste sichern"
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -992,25 +1057,25 @@ msgstr "Hintergrundeffekte"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "Aus"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "Niedrig"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "Hoch"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr "Mittel"
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr "max"
 
@@ -1050,29 +1115,21 @@ msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
@@ -1082,44 +1139,44 @@ msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
 msgid "skills.xml"
 msgstr "Fertigkeiten"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr "Erhöhen"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Benutzen"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d GP"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1127,11 +1184,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 msgid "Job:"
 msgstr ""
 
@@ -1139,101 +1196,101 @@ msgstr ""
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr "Statistiken"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr "Gesamt"
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr "Preis"
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr "Angriff:"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr "Verteidigung:"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr "M.Angriff:"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr "M.Verteidigung:"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr "% Genauigkeit"
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr "% Ausweichen:"
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr "% Reaktion:"
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr "Stärke"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr "Beweglichkeit"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr "Gesundheit"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr "Intelligenz"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr "Ausdauer"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr "Glück"
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 #, fuzzy
 msgid "Trade: You"
 msgstr "Handeln"
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr "Handeln"
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Du erhälst %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1543,51 +1600,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-#, fuzzy
-msgid "Unknown item"
-msgstr "Unbekannter Befehl"
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr "Unbenannt"
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1663,200 +1715,375 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
+msgid "Attack"
+msgstr "Angriff:"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Talk"
+msgstr "Gesamt"
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Angriff:"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "Target Player"
+msgstr "Spieler"
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Fenster zurücksetzen"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Aufteilen"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Tastenkürzel"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Fenster zurücksetzen"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventar"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Ausrüstung"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Fenster zurücksetzen"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Fenster zurücksetzen"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Fenster zurücksetzen"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Emote fehlgeschlagen!"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Tastenkürzel"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Server auswählen"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Verbinde zu [account server]..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Verbinde zu [character server]..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Verbinde zu [map server]..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Name : %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr "Verbinde zu [map server]..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr "Verbinde zu [character server]..."
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr "Verbinde zu [account server]..."
 
@@ -1923,91 +2150,87 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Erstellen"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 #, fuzzy
 msgid "Unknown /party command."
 msgstr "Unbekannter Befehl."
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2049,9 +2272,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Bitte entferne %d Punkte"
 
-#~ msgid "Split"
-#~ msgstr "Aufteilen"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Wähle aus, wieviel Gegenstände Du aufteilen möchtest."
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 5127321c..b728f113 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Buy"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Price: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Exit"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
@@ -49,34 +50,34 @@ msgstr "Effect: %s"
 msgid "Shop"
 msgstr "Stop"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Sell"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 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:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Select Character"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
@@ -86,420 +87,449 @@ msgstr "Name: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Money: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "New"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Delete"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Previous"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Next"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Create Character"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Hair Colour:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Hair Style:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Create"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Select Character"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Create"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Changing OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "high"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -530,15 +560,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "No"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Connecting..."
 
@@ -546,66 +576,66 @@ msgstr "Connecting..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Use"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipment"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Unequip"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventory"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Equip"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Drop"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -613,11 +643,11 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -625,22 +655,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Keep"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Register"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Skills"
 
@@ -649,7 +679,7 @@ msgid "Shortcut"
 msgstr "Shortcut"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Setup"
 
@@ -657,146 +687,180 @@ msgstr "Setup"
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Register"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Trade With %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attack %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Talk To NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equip@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Equip@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Drop@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Connecting..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Connecting..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Connecting..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Confirm:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "The username needs to be at least %d characters long."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "The username needs to be less than %d characters long."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "The password needs to be at least %d characters long."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "The password needs to be less than %d characters long."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Error"
 
@@ -812,47 +876,47 @@ msgstr "Sfx volume"
 msgid "Music volume"
 msgstr "Music volume"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Apply"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr "Colours"
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -893,48 +957,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Name:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -994,25 +1058,25 @@ msgstr "Ambient FX"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "off"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "low"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "high"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1050,29 +1114,21 @@ msgstr "Changing OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Restart needed for changes to take effect."
@@ -1082,44 +1138,44 @@ msgstr "Restart needed for changes to take effect."
 msgid "skills.xml"
 msgstr "Skills"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Use"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Money: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1127,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Level: %d"
@@ -1140,110 +1196,110 @@ msgstr "Level: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Attack %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Defense %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attack %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defense %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Add"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "You get %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "You give:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1549,50 +1605,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1666,201 +1718,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Are you sure you want to delete this character?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Are you sure you want to delete this character?"
+msgid "Attack"
+msgstr "Attack %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Attack %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Reset Windows"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Split"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Shortcut"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Reset Windows"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventory"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Equipment"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Reset Windows"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Reset Windows"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Reset Windows"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Reset Windows"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Shortcut"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Select Character"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Name: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connecting..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1926,90 +2151,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Create"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2038,9 +2259,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Please remove %d points"
 
-#~ msgid "Split"
-#~ msgstr "Split"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Select amount of items to split."
 
diff --git a/po/eo.po b/po/eo.po
index 227d9ada..c8047348 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr ""
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr ""
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr ""
@@ -48,34 +49,34 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr ""
@@ -85,417 +86,445 @@ msgstr ""
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 msgid "Chat"
 msgstr ""
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -524,15 +553,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr ""
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr ""
 
@@ -540,66 +569,66 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -607,11 +636,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr ""
 
@@ -619,22 +648,22 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr ""
 
@@ -643,7 +672,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr ""
 
@@ -651,141 +680,173 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr ""
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+msgid "Recorder"
+msgstr ""
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+msgid "Already recording."
+msgstr ""
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 msgid "Recording..."
 msgstr ""
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr ""
 
@@ -801,47 +862,47 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr ""
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -881,47 +942,47 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -981,25 +1042,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1036,28 +1097,20 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1065,43 +1118,43 @@ msgstr ""
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1109,11 +1162,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 msgid "Job:"
 msgstr ""
 
@@ -1121,100 +1174,100 @@ msgstr ""
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr ""
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr ""
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr ""
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr ""
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr ""
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr ""
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1519,50 +1572,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1636,196 +1685,356 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+msgid "Are you sure you want to quit?"
+msgstr ""
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
-msgid "Are you sure you want to quit?"
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
+msgid "Sit"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
 msgstr ""
 
-#: ../src/game.cpp:784
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
 #, c-format
-msgid "Warning: guichan input exception: %s"
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:72
+msgid "Status Window"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:73
+msgid "Inventory Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:74
+msgid "Equipment WIndow"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
 #, c-format
-msgid "Error: Invalid update host: %s"
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+msgid "Select OK"
 msgstr ""
 
 #: ../src/main.cpp:214
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1890,88 +2099,84 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 msgid "   /create"
 msgstr ""
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
diff --git a/po/es.po b/po/es.po
index e9fbddb6..59a7442a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-10-15 01:37+0000\n"
 "Last-Translator: catalania <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Comprar"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Precio: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Salir"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Efecto: %s"
@@ -49,34 +50,34 @@ msgstr "Efecto: %s"
 msgid "Shop"
 msgstr "Detener"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Vender"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Seleccionar personaje"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
@@ -86,420 +87,449 @@ msgstr "Nombre: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivel: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Dinero: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Nuevo"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Color de pelo:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "corte de pelo"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Crear"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Seleccionar personaje"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Crear"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Cambiar a OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "alto"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -530,15 +560,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "No"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Conectando…"
 
@@ -546,66 +576,66 @@ msgstr "Conectando…"
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Usar"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipo"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "quitarselo"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Equipar"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "tirar"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -613,11 +643,11 @@ msgstr ""
 msgid "Login"
 msgstr "conectarse"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Puerto:"
 
@@ -625,22 +655,22 @@ msgstr "Puerto:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Mantener"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registrar"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Estado"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -649,7 +679,7 @@ msgid "Shortcut"
 msgstr "Atajos"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Configuración"
 
@@ -657,146 +687,180 @@ msgstr "Configuración"
 msgid "MiniMap"
 msgstr "Minimapa"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registrar"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Comerciar con %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Atacar a %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Hablar al NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Recoger %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Tirar@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Conectando…"
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Conectando…"
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Conectando…"
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "El nombre de usuario debe tener al menos %d caracteres."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "El nombre de usuario puede tener como máximo %d caracteres."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La contraseña puede tener como máximo %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Error"
 
@@ -812,47 +876,47 @@ msgstr "Volumen efectos"
 msgid "Music volume"
 msgstr "Volumen musica"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Reiniciar ventanas"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -893,48 +957,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Nombre:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -994,25 +1058,25 @@ msgstr "Efectos ambientales"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "desactivado"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "bajo"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "alto"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1050,29 +1114,21 @@ msgstr "Cambiar a OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
@@ -1082,44 +1138,44 @@ msgstr "Se necesita reiniciar para aplicar los cambios."
 msgid "skills.xml"
 msgstr "Habilidades"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Usar"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivel: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinero: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1127,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Nivel: %d"
@@ -1140,110 +1196,110 @@ msgstr "Nivel: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Estado"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Ataque %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Defensa %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Ataque %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Defensa %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Fuerza:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidad:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidad:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencia:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Añadir"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Tu consigues %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Tu das:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1549,50 +1605,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1666,201 +1718,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "¿Seguro que quieres borrar este personaje?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "¿Seguro que quieres borrar este personaje?"
+msgid "Attack"
+msgstr "Ataque %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Ataque %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Reiniciar ventanas"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Dividir"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Atajos"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Reiniciar ventanas"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Estado"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventario"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Equipo"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Reiniciar ventanas"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Reiniciar ventanas"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Reiniciar ventanas"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Reiniciar ventanas"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atajos"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Seleccionar personaje"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nombre: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando…"
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1926,90 +2151,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Crear"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2038,9 +2259,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "por favor quita %d puntos"
 
-#~ msgid "Split"
-#~ msgstr "Dividir"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Seleccione objetos para dividir."
 
diff --git a/po/fi.po b/po/fi.po
index d81eaae8..58fc324d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Osta"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Sulje"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Kuvaus: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Vaikutus: %s"
@@ -49,35 +50,35 @@ msgstr "Vaikutus: %s"
 msgid "Shop"
 msgstr "Lopeta"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Myy"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 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:82
+#: ../src/gui/char_select.cpp:83
 #, fuzzy
 msgid "Select Character"
 msgstr "Luo hahmo"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
@@ -87,420 +88,449 @@ msgstr "Nimi: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Taso: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Rahatilanne: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Uusi"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Hiusten väri:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Hiustyyli:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Luo"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Vaihda palvelinta"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Luo"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "korkea"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -531,15 +561,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Ei"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
@@ -547,66 +577,66 @@ msgstr "Yhdistetään..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Käytä"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Pudota"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -614,11 +644,11 @@ msgstr ""
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Portti:"
 
@@ -626,22 +656,22 @@ msgstr "Portti:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Hahmon tiedot"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Taidot"
 
@@ -650,7 +680,7 @@ msgid "Shortcut"
 msgstr "Pikavalinnat"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -658,146 +688,180 @@ msgstr "Asetukset"
 msgid "MiniMap"
 msgstr "Apukartta"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Rekisteröidy"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Hyökkää %s kimppuun@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Puhu epäpelattavalle hahmolle@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Peruuta@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Poimi %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Käytä@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Pudota maahan@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Yhdistetään..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Yhdistetään..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Yhdistetään..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Vahvista:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Virhe"
 
@@ -813,47 +877,47 @@ msgstr "Äänitehosteiden voimakkuus"
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Käytä"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Kuva"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Ääni"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Peliohjain"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -894,48 +958,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Nimi:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -995,25 +1059,25 @@ msgstr "Taustaäänet"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "pois päältä"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "matala"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "korkea"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1051,29 +1115,21 @@ msgstr "Vaihdetaan OpenGL -toimintatilaan"
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
@@ -1083,44 +1139,44 @@ msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan
 msgid "skills.xml"
 msgstr "Taidot"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Käytä"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Taso: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Rahatilanne: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1128,11 +1184,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Taso: %d"
@@ -1141,110 +1197,110 @@ msgstr "Taso: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Hahmon tiedot"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Hyökkäys %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Puolustus %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Hyökkäys %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Puolustus %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Voima:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Ketteryys:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Elinvoima:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Älykkyys:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Näppäryys:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Sait %d GP"
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Annat:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1550,50 +1606,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1667,201 +1719,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+msgid "Attack"
+msgstr "Hyökkäys %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Hyökkäys %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Jaa"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Pikavalinnat"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Hahmon tiedot"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Tavaraluettelo"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Varusteet"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Pikavalinnat"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Vaihda palvelinta"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nimi: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Yhdistetään..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1927,90 +2152,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Luo"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2054,9 +2275,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "%d pistettä liikaa"
 
-#~ msgid "Split"
-#~ msgstr "Jaa"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
diff --git a/po/fr.po b/po/fr.po
index c36464e2..f1c00700 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -23,24 +23,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Acheter"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prix : %d PO / Total : %d PO"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Quitter"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effet : %s"
@@ -50,34 +51,34 @@ msgstr "Effet : %s"
 msgid "Shop"
 msgstr "Stop"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Vendre"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Choix du personnage"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Nom : %s"
@@ -87,420 +88,449 @@ msgstr "Nom : %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Niveau : %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Argent : %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Suivant"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Couleur des cheveux"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Coiffure :"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Créer"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Choix du personnage"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Créer"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Changement OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "complet"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -531,15 +561,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Oui"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Non"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Connexion..."
 
@@ -547,66 +577,66 @@ msgstr "Connexion..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Utiliser"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Équipement"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Retirer"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Équiper"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Lâcher"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -614,11 +644,11 @@ msgstr ""
 msgid "Login"
 msgstr "Connexion"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port :"
 
@@ -626,22 +656,22 @@ msgstr "Port :"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Conserver"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "S'inscrire"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Statut"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Compétences"
 
@@ -650,7 +680,7 @@ msgid "Shortcut"
 msgstr "Raccourci"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Configuration"
 
@@ -658,146 +688,180 @@ msgstr "Configuration"
 msgid "MiniMap"
 msgstr "Plan"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "S'inscrire"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "PNJ"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Troquer avec %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attaquer %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parler au PNJ@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ramasser %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Équiper@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Équiper@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Utiliser@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lâcher@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Connexion..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Connexion..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Connexion..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Vérification :"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Masculin"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Féminin"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Le mot de passe doit faire moins de %d caractères."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Erreur"
 
@@ -813,47 +877,47 @@ msgstr "Volume des effets sonores"
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -894,48 +958,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Nom :"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -995,25 +1059,25 @@ msgstr "Effets ambiants"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "aucun"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "léger"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "complet"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1053,30 +1117,22 @@ 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/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
@@ -1087,44 +1143,44 @@ msgstr ""
 msgid "skills.xml"
 msgstr "Compétences"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Utiliser"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Niveau : %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Argent : %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1132,11 +1188,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Niveau : %d"
@@ -1145,110 +1201,110 @@ msgstr "Niveau : %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Statut"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Attaque %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Défense %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attaque %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Défense %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Force :"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Agilité :"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalité :"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence :"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dextérité :"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Vous obtenez %d PO."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1554,50 +1610,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1671,201 +1723,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
+msgid "Attack"
+msgstr "Attaque %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Attaque %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Rétablir les fenêtres"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Partager"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Raccourci"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Rétablir les fenêtres"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Statut"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventaire"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Équipement"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Rétablir les fenêtres"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Rétablir les fenêtres"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Rétablir les fenêtres"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Rétablir les fenêtres"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Raccourci"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Choix du personnage"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nom : %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connexion..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1931,90 +2156,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Créer"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2058,9 +2279,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Veuillez retirer %d points"
 
-#~ msgid "Split"
-#~ msgstr "Partager"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Choisissez le nombre d'objets à déplacer."
 
diff --git a/po/he.po b/po/he.po
index c3334c43..cf9af327 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "קנה"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "מחיר: %d זהב / סה\"כ %d זהב"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "יציאה"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "השפעה: %s"
@@ -49,35 +50,35 @@ msgstr "השפעה: %s"
 msgid "Shop"
 msgstr "עצור"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "מכר"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 #, fuzzy
 msgid "Select Character"
 msgstr "צור שחקן"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "שם: %s"
@@ -87,420 +88,449 @@ msgstr "שם: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "רמה: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "זהב: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "חדש"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "מחק"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "הקודם"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "הבא"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "אישור"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "שם:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "צבע שיער:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "תיספורת:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "צור"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "החלף שרת"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "צור"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "שרת:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "משנה OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "גבוה"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -531,15 +561,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "כן"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "לא"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "מתחבר..."
 
@@ -547,66 +577,66 @@ msgstr "מתחבר..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "השתמש"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "ציוד"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "הורד"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "ציוד"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "החזק"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "השלך"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -614,11 +644,11 @@ msgstr ""
 msgid "Login"
 msgstr "התחברות"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "פורט:"
 
@@ -626,22 +656,22 @@ msgstr "פורט:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "הרשם"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "מצב"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "כישורים"
 
@@ -650,7 +680,7 @@ msgid "Shortcut"
 msgstr "קיצור-דרך"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "הגדרות"
 
@@ -658,146 +688,180 @@ msgstr "הגדרות"
 msgid "MiniMap"
 msgstr "מיני-מפה"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "הרשם"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|סחור עם %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|תקוף את %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|דבר אל NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|ביטול@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|הרם %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|החזק@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|החזק@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|השלך@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "מתחבר..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "מתחבר..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "מתחבר..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "אשר:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "זכר"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "נקבה"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "שגיאה"
 
@@ -813,47 +877,47 @@ msgstr "עוצמת SFX"
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "אשר"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "אתחל חלונות"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "וידאו"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "שמע"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "ג'ויסטיק"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "מקלדת"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -894,48 +958,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "שם:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -995,25 +1059,25 @@ msgstr "אופף FX"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "כבוי"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "נמוך"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "גבוה"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1051,29 +1115,21 @@ msgstr "משנה OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
@@ -1083,44 +1139,44 @@ msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף
 msgid "skills.xml"
 msgstr "כישורים"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "השתמש"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "רמה: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "זהב: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1128,11 +1184,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "רמה: %d"
@@ -1141,110 +1197,110 @@ msgstr "רמה: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "מצב"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "התקפה %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "הגנה %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "התקפה %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "הגנה %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "עוצמה:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "זריזות:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "חיוניות:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "תבונה:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "מיומנות:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "הוסף"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "אתה מקבל %d זהב."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1550,50 +1606,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1667,201 +1719,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
+msgid "Attack"
+msgstr "התקפה %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "התקפה %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "אתחל חלונות"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "פצל"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "קיצור-דרך"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "אתחל חלונות"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "מצב"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "ציוד"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "ציוד"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "אתחל חלונות"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "אתחל חלונות"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "אתחל חלונות"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "אתחל חלונות"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "קיצור-דרך"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "החלף שרת"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "שם: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "מתחבר..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1927,90 +2152,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "צור"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2054,9 +2275,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "אנא הסר %d נקודות"
 
-#~ msgid "Split"
-#~ msgstr "פצל"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "בחר כמות חפצים לפצל."
 
diff --git a/po/hr.po b/po/hr.po
index cf2db91b..952492b6 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Kupi"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Izlaz"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Učinak: %s"
@@ -48,35 +49,35 @@ msgstr "Učinak: %s"
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Poništi"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 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:82
+#: ../src/gui/char_select.cpp:83
 #, fuzzy
 msgid "Select Character"
 msgstr "Stvori Lika"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Ime: %s"
@@ -86,418 +87,446 @@ msgstr "Ime: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nivo: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Novac: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Novi"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Prethodni"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Slijedeći"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "U redu"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Boja kose:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Frizura:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Stvori"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Stvori"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -526,15 +555,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Ne"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Spajanje..."
 
@@ -542,66 +571,66 @@ msgstr "Spajanje..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Oprema"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Opremi"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Ispusti"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -609,11 +638,11 @@ msgstr ""
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Lozinka"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr ""
 
@@ -621,22 +650,22 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registriraj se"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Stanje"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Vještine"
 
@@ -645,7 +674,7 @@ msgid "Shortcut"
 msgstr "Kratica"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -653,144 +682,178 @@ msgstr "Podešavanje"
 msgid "MiniMap"
 msgstr "Karta"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registriraj se"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr ""
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "Skini opremu"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Spajanje..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Spajanje..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Spajanje..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Muško"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Žensko"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Greška"
 
@@ -806,47 +869,47 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr ""
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -887,48 +950,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Ime:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -988,25 +1051,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1043,28 +1106,20 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1073,44 +1128,44 @@ msgstr ""
 msgid "skills.xml"
 msgstr "Vještine"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Upotrijebi"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nivo: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Novac: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1118,11 +1173,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Nivo: %d"
@@ -1131,106 +1186,106 @@ msgstr "Nivo: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Stanje"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Snaga:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Okretnost:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalnost:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencija:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Spretnost:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1536,50 +1591,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1653,201 +1704,365 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+msgid "Sit"
+msgstr "Razdvoji"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Kratica"
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Stanje"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Zalihe"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Oprema"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Kratica"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+msgid "Select OK"
+msgstr ""
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Ime: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Spajanje..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1913,90 +2128,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Stvori"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2037,9 +2248,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Molimo, oduzmi %d bodova"
 
-#~ msgid "Split"
-#~ msgstr "Razdvoji"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Odaberi količinu predmeta za razdvajanje."
 
diff --git a/po/id.po b/po/id.po
index ab3226c8..b2c90547 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Beli"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Harga: %d GP / Jumlah: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Keluar"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Deskripsi: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Efek: %s"
@@ -49,34 +50,34 @@ msgstr "Efek: %s"
 msgid "Shop"
 msgstr "Berhenti"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Jual"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Pilih Karakter"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
@@ -86,420 +87,449 @@ msgstr "Nama: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Tingkatan: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Uang: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Buat baru"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Hapus"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Berikutnya"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Warna Rambut:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Gaya Rambut:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Buat"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Pilih Karakter"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Buat"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Mengubah OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "tinggi"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -530,15 +560,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Ya"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Tidak"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Menyambung..."
 
@@ -546,66 +576,66 @@ msgstr "Menyambung..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Gunakan"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Jatuh"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -613,11 +643,11 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -625,22 +655,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Pertahankan"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Mendaftar"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -649,7 +679,7 @@ msgid "Shortcut"
 msgstr "Tombol Singkat"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Atur"
 
@@ -657,146 +687,180 @@ msgstr "Atur"
 msgid "MiniMap"
 msgstr "MiniMap"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Mendaftar"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Dagang Dengan %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Serang%s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Bicara dengan NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Batal@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Ambil %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Gunakan@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Buang@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Menyambung..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Menyambung..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Menyambung..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Panjang username setidak-tidaknya %d karakter"
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -812,47 +876,47 @@ msgstr "Volume sfx"
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Terapkan"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Suara"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -893,48 +957,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Nama:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -994,25 +1058,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "mati"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "rendah"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "tinggi"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1050,29 +1114,21 @@ msgstr "Mengubah OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
@@ -1082,44 +1138,44 @@ msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 msgid "skills.xml"
 msgstr "Keahlian"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Gunakan"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Tingkatan: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Uang: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1127,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Tingkatan: %d"
@@ -1140,110 +1196,110 @@ msgstr "Tingkatan: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Status"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Serangan %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Pertahanan %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Serangan %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Pertahanan %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Kekuatan"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Daya/Tenaga Hidup"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Daya/Tenaga Hidup"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Kecerdasan"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ketangkasan"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Tambah"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Anda mendapatkan %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1549,50 +1605,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1666,201 +1718,368 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+msgid "Attack"
+msgstr "Serangan %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Serangan %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Pecah"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Tombol Singkat"
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventaris"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Perlengkapan"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Tombol Singkat"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Pilih Karakter"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nama: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Menyambung..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1926,90 +2145,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Buat"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2038,9 +2253,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Tolong hilangkan %d point"
 
-#~ msgid "Split"
-#~ msgstr "Pecah"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Pilih jumlah item yang mau di pisahkan"
 
diff --git a/po/it.po b/po/it.po
index 5a3782f1..b64401cb 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2007-12-03 01:45+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -24,24 +24,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Compra"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Prezzo: %d GP / Totale: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Esci"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Descrizione : %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effetto : %s"
@@ -51,34 +52,34 @@ msgstr "Effetto : %s"
 msgid "Shop"
 msgstr "Ferma"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Vendi"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancella"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Scelta Personaggio"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Nome : %s"
@@ -88,420 +89,449 @@ msgstr "Nome : %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Livello: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Monete: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Nuovo"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Prossimo"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Nome :"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Colore Capelli"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Stile Capelli:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Create"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Scelta Personaggio"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Create"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Modifica OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "Alto"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -532,15 +562,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "No"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Connessione..."
 
@@ -548,66 +578,66 @@ msgstr "Connessione..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Usa"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Rimuovi"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventario"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Lascia"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -615,11 +645,11 @@ msgstr ""
 msgid "Login"
 msgstr "Autenticazione"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Porta:"
 
@@ -627,22 +657,22 @@ msgstr "Porta:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Mantieni"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registra"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Stato"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Abilità"
 
@@ -651,7 +681,7 @@ msgid "Shortcut"
 msgstr "Scorciatoia"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -659,146 +689,180 @@ msgstr "Impostazioni"
 msgid "MiniMap"
 msgstr "Mini mappa"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registra"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Scambia Con %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attacca %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Parla con NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@usa|Usa@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lascia@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Connessione..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Connessione..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Connessione..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La password deve contenere meno di %d caratteri."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Errore"
 
@@ -814,47 +878,47 @@ msgstr "Volume effetti sonori"
 msgid "Music volume"
 msgstr "Volume musica"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Applica"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -895,48 +959,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Nome :"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -996,25 +1060,25 @@ msgstr "Suoni ambientali"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "Spento"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "Basso"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "Alto"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1052,29 +1116,21 @@ msgstr "Modifica OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
@@ -1084,44 +1140,44 @@ msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 msgid "skills.xml"
 msgstr "Abilità"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Usa"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Livello: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Monete: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1129,11 +1185,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Livello: %d"
@@ -1142,110 +1198,110 @@ msgstr "Livello: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Stato"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Attacco %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Difesa %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Attacco %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Difesa %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Forza:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Agilità:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalità:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligenza:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destrezza:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Ottieni %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dai:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1551,50 +1607,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1668,201 +1720,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Sei sicuro di voler cancellare questo personaggio?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Sei sicuro di voler cancellare questo personaggio?"
+msgid "Attack"
+msgstr "Attacco %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Attacco %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Resetta finestre"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Lascia"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Scorciatoia"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Resetta finestre"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Stato"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventario"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Equipaggiamento"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Resetta finestre"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Resetta finestre"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Resetta finestre"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Resetta finestre"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Scorciatoia"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Scelta Personaggio"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome : %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connessione..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1928,90 +2153,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Create"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2040,9 +2261,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Prego rimuovi %d punti"
 
-#~ msgid "Split"
-#~ msgstr "Lascia"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Seleziona la quantità di oggetti da lasciare."
 
diff --git a/po/ja.po b/po/ja.po
index 184cccfa..dfd90392 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-06-28 16:27+0000\n"
 "Last-Translator: fate <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "買う"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "価格: %d GP / 合計: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "終了"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "名状: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "効用: %s"
@@ -48,34 +49,34 @@ msgstr "効用: %s"
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "キャラを選択"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "名前: %s"
@@ -85,419 +86,447 @@ msgstr "名前: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "レベル: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "GP: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "新規"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "削除"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "前へ"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "次へ"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "了解"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "名前:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "髪の色："
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "髪型："
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "作成"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "キャラを選択"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "作成"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "サーバ:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -528,15 +557,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "はい"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "いいえ"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "接続しています..."
 
@@ -544,66 +573,66 @@ msgstr "接続しています..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "使う"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -611,11 +640,11 @@ msgstr ""
 msgid "Login"
 msgstr "ログイン"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "ポート:"
 
@@ -623,22 +652,22 @@ msgstr "ポート:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "状態"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr ""
 
@@ -647,7 +676,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "セットアップ"
 
@@ -655,144 +684,178 @@ msgstr "セットアップ"
 msgid "MiniMap"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr ""
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|%sを攻撃する@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|NPCを喋る@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|使う@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|使う@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "接続しています..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "接続しています..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "接続しています..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "エラー"
 
@@ -808,47 +871,47 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "音声"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -889,48 +952,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "名前:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -990,25 +1053,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1045,28 +1108,20 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1074,44 +1129,44 @@ msgstr ""
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "使う"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "レベル: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "GP: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1119,11 +1174,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "レベル: %d"
@@ -1132,106 +1187,106 @@ msgstr "レベル: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "状態"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "筋力:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "素早さ:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "体力:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "知性:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "敏捷:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1537,50 +1592,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1654,201 +1705,364 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "このキャラは消してもいいですか?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "このキャラは消してもいいですか?"
+msgid "Sit"
+msgstr "分割"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
 msgstr ""
 
-#: ../src/game.cpp:784
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
 #, c-format
-msgid "Warning: guichan input exception: %s"
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "状態"
+
+#: ../src/keyboardconfig.cpp:73
+msgid "Inventory Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:74
+msgid "Equipment WIndow"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
 #, c-format
-msgid "Error: Invalid update host: %s"
+msgid "Emote Shortcut %d"
 msgstr ""
 
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "キャラを選択"
+
 #: ../src/main.cpp:214
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "名前: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "接続しています..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1913,90 +2127,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "作成"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2009,9 +2219,6 @@ msgstr ""
 #~ msgid "Please distribute %d points"
 #~ msgstr "%d ポイントを取り分けください"
 
-#~ msgid "Split"
-#~ msgstr "分割"
-
 #~ msgid "Email:"
 #~ msgstr "Eメール："
 
diff --git a/po/nl.po b/po/nl.po
index 8a15e372..3d52dd57 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2009-01-18 16:53+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Kopen"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr ""
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Afsluiten"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effect: %s"
@@ -48,34 +49,34 @@ msgstr "Effect: %s"
 msgid "Shop"
 msgstr "Winkel"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Verkopen"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 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:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Kies Personage"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
@@ -85,424 +86,456 @@ msgstr "Naam: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Geld: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Nieuw"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Volgende"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "OK"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr "Goud: %d"
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Haarkleur:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Haarstijl:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Aanmaken"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr "Server Selecteren"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr "OK"
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Aanmaken"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 #, fuzzy
 msgid "Global announcement: "
 msgstr "/announce: Globale aankondiging (alleen voor GM)"
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, fuzzy, c-format
 msgid "Global announcement from %s: "
 msgstr "/announce: Globale aankondiging (alleen voor GM)"
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+#, fuzzy
+msgid "Unknown item"
+msgstr "Onbekende opdracht"
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Het ziet ernaar uit dat je meer geld nodig hebt... ;-)"
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Veranderen van OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: Globale aankondiging (alleen voor GM)"
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr "/who: Geef het aantal online gebruikers weer"
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr "Commando: /announce <msg>"
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr "Commando: /clear"
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr "Commando: /help"
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr "Commando: /help <commando>"
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 #, fuzzy
 msgid "Command: /present"
 msgstr "Commando: /where"
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+#, fuzzy
+msgid "Command: /record <filename>"
+msgstr "Commando: /clear"
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+#, fuzzy
+msgid "Command: /record"
+msgstr "Commando: /clear"
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 #, fuzzy
 msgid "Command: /toggle <state>"
 msgstr "Commando: /announce <msg>"
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 #, fuzzy
 msgid "Command: /toggle"
 msgstr "Commando: /clear"
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr "Commando: /where"
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 #, fuzzy
 msgid "Command: /msg <nick> <msg>"
 msgstr "Commando: /announce <msg>"
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr "Type /help voor een lijst van commando's."
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "hoog"
+
 #: ../src/gui/colour.cpp:34
 #, fuzzy
 msgid "Player"
@@ -535,15 +568,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Nee"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Verbinden..."
 
@@ -551,66 +584,66 @@ msgstr "Verbinden..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Gebruiken"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -618,11 +651,11 @@ msgstr ""
 msgid "Login"
 msgstr "Inloggen"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Poort:"
 
@@ -630,22 +663,22 @@ msgstr "Poort:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Behouden"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Aanmelden"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -654,7 +687,7 @@ msgid "Shortcut"
 msgstr "Sneltoets"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Configureren"
 
@@ -662,145 +695,179 @@ msgstr "Configureren"
 msgid "MiniMap"
 msgstr "Kaartje"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Aanmelden"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Handelen met %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|%s aanvallen@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Praat met NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Gebruiken@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Neerleggen@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Verbinden..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Verbinden..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Verbinden..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Mannelijk"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Fout"
 
@@ -816,48 +883,48 @@ msgstr "Volume van geluiden"
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Toepassen"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 #, fuzzy
 msgid "Colors"
 msgstr "Sluiten"
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr "Spelers"
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -897,47 +964,47 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr "Relatie"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr "Vriend"
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -997,25 +1064,25 @@ msgstr "Omgevingseffecten"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "uit"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "laag"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "hoog"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr "gemiddeld"
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr "max"
 
@@ -1053,29 +1120,21 @@ 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/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
@@ -1085,44 +1144,44 @@ msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 msgid "skills.xml"
 msgstr "Vaardigheden"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Gebruiken"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr "Geld: %d GP"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1130,11 +1189,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 msgid "Job:"
 msgstr ""
 
@@ -1142,100 +1201,100 @@ msgstr ""
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr ""
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr "Totaal"
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr "Kosten"
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr ""
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr ""
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr ""
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr ""
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr ""
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Jij krijgt %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1542,51 +1601,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-#, fuzzy
-msgid "Unknown item"
-msgstr "Onbekende opdracht"
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr "Naamloos"
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1662,200 +1716,373 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
+msgid "Talk"
+msgstr "Totaal"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "Target Player"
+msgstr "Spelers"
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Vensters in beginstand"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Splitsen"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Sneltoets"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Vensters in beginstand"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventaris"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Uitrusting"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Vensters in beginstand"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Vensters in beginstand"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Vensters in beginstand"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Vensters in beginstand"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Sneltoets"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Server Selecteren"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Verbinden met de account server..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Verbinden met de karakter server..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Verbinden met de map server..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Naam: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr "Verbinden met de map server..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr "Verbinden met de karakter server..."
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr "Verbinden met de account server..."
 
@@ -1921,95 +2148,91 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 #, fuzzy
 msgid "Command: /party <command> <args>"
 msgstr "Commando: /help <commando>"
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Aanmaken"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 #, fuzzy
 msgid "Command: /party new <party-name>"
 msgstr "Commando: /announce <msg>"
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 #, fuzzy
 msgid "Command: /party prefix"
 msgstr "Commando: /clear"
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 #, fuzzy
 msgid "Command: /party leave"
 msgstr "Commando: /clear"
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 #, fuzzy
 msgid "Unknown /party command."
 msgstr "Onbekende opdracht"
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 #, fuzzy
 msgid "Type /help party for a list of options."
 msgstr "Type /help voor een lijst van commando's."
@@ -2046,9 +2269,6 @@ msgstr "Type /help voor een lijst van commando's."
 #~ msgid "Please remove %d points"
 #~ msgstr "Verwijder alstublieft %d punten"
 
-#~ msgid "Split"
-#~ msgstr "Splitsen"
-
 #~ msgid "Switch server"
 #~ msgstr "Van server wisselen"
 
diff --git a/po/pl.po b/po/pl.po
index 4d1691a4..4c4dba5d 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-10-10 05:26+0000\n"
 "Last-Translator: Michał Trzebiatowski <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -24,24 +24,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Kup"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Razem: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Wyjdź"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Efekt: %s"
@@ -51,34 +52,34 @@ msgstr "Efekt: %s"
 msgid "Shop"
 msgstr "Zatrzymaj"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Sprzedaj"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Wybierz postać"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Imię: %s"
@@ -88,420 +89,449 @@ msgstr "Imię: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Poziom: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Pieniądze: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Nowa"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Usuń"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Następny"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Imię:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Kolor włosów:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Fryzura:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Stwórz"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Wybierz postać"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Stwórz"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Serwer:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Zmień ustawienia OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "wysokie"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -532,15 +562,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Tak"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Nie"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Łączenie..."
 
@@ -548,66 +578,66 @@ msgstr "Łączenie..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Użyj"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Zdejmij"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Załóż"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Upuść"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -615,11 +645,11 @@ msgstr ""
 msgid "Login"
 msgstr "Użytkownik"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -627,22 +657,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Zachowaj"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Rejestruj"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Stan"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -651,7 +681,7 @@ msgid "Shortcut"
 msgstr "Skrót"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -659,146 +689,180 @@ msgstr "Konfiguracja"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Rejestruj"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Targ z %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Atakuj %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Rozmawiaj z NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Podnieś %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Załóż@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Załóż@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Użyj@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Upuść@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Łączenie..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Łączenie..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Łączenie..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Kobieta"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Hasło musi mieć conajmniej %d znaków."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Hasło nie może mieć więcej jak %d znaków."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Błąd"
 
@@ -814,47 +878,47 @@ msgstr "Głośność efektów dźwiękowych"
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Obraz"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -895,48 +959,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Imię:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -996,25 +1060,25 @@ msgstr "Dźwięki otoczenia"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "wyłączone"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "niskie"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "wysokie"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1053,29 +1117,21 @@ msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
@@ -1085,44 +1141,44 @@ msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
 msgid "skills.xml"
 msgstr "Zdolności"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Użyj"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Poziom: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Pieniądze: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1130,11 +1186,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Poziom: %d"
@@ -1143,110 +1199,110 @@ msgstr "Poziom: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Stan"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Atak %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Obrona %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Atak %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Obrona %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Siła:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Zwinność:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Witalność:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencja:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Zręczność:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Otrzymujesz %d GP"
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1552,50 +1608,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1669,201 +1721,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
+msgid "Attack"
+msgstr "Atak %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Atak %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Zresetuj okna"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Podziel"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Skrót"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Zresetuj okna"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Stan"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inwentarz"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Ekwipunek"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Zresetuj okna"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Zresetuj okna"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Zresetuj okna"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Zresetuj okna"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Skrót"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Wybierz postać"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Imię: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Łączenie..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1929,90 +2154,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Stwórz"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2044,9 +2265,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Proszę usunąć %d punktów"
 
-#~ msgid "Split"
-#~ msgstr "Podziel"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Wybierz ilość przedmiotów do podziału."
 
diff --git a/po/pt.po b/po/pt.po
index 1d449423..db28b364 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-02-03 10:14+0000\n"
 "Last-Translator: Tiago Silva <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Comprar"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Sair"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
@@ -49,34 +50,34 @@ msgstr "Efeito: %s"
 msgid "Shop"
 msgstr "Parar"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Vender"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Seleccione um Personagem"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
@@ -86,420 +87,449 @@ msgstr "Nome: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Novo"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Cor de Cabelo:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Criar"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Seleccione um Personagem"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Criar"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Mudando OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "elevado"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -530,15 +560,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Sim"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Não"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Conectando..."
 
@@ -546,66 +576,66 @@ msgstr "Conectando..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Usar"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventário"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Equipar"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Largar"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -613,11 +643,11 @@ msgstr ""
 msgid "Login"
 msgstr "Autenticar"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Porta:"
 
@@ -625,22 +655,22 @@ msgstr "Porta:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registo"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Estado"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Competências"
 
@@ -649,7 +679,7 @@ msgid "Shortcut"
 msgstr "Atalho"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Configuração"
 
@@ -657,146 +687,180 @@ msgstr "Configuração"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registo"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Negociar com %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Atacar %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Falar com o NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Apanhar %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Largar@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Conectando..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Conectando..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Conectando..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A password necessita de pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A password só pode ter até %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Erro"
 
@@ -812,47 +876,47 @@ msgstr "Volume dos Efeitos"
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Reiniciar Janelas"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -893,48 +957,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -994,25 +1058,25 @@ msgstr "Efeitos Ambientais"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "desligado"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "baixo"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "elevado"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1050,29 +1114,21 @@ msgstr "Mudando OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
@@ -1082,44 +1138,44 @@ msgstr "É necessário reiniciar para as alterações terem efeito."
 msgid "skills.xml"
 msgstr "Competências"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Usar"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1127,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Nível: %d"
@@ -1140,118 +1196,118 @@ msgstr "Nível: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Estado"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr ""
 "Copy text   \t\r\n"
 "Ataque %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr ""
 "Copy text   \t\r\n"
 "Defesa %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr ""
 "Copy text   \t\r\n"
 "Ataque %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr ""
 "Copy text   \t\r\n"
 "Defesa %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Força:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Agilidade:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalidade:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligência:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Destreza:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Recebe %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Dá:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1557,50 +1613,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1674,201 +1726,378 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Tem a certeza que quer apagar este personagem"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Tem a certeza que quer apagar este personagem"
+msgid "Attack"
+msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Reiniciar Janelas"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Dividir"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Atalho"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Reiniciar Janelas"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Estado"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventário"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Equipamento"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Reiniciar Janelas"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Reiniciar Janelas"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Reiniciar Janelas"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Reiniciar Janelas"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atalho"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Seleccione um Personagem"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Conectando..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1934,90 +2163,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Criar"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2046,9 +2271,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Por favor remova %d pontos"
 
-#~ msgid "Split"
-#~ msgstr "Dividir"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Seleccionar a quantidade de itens a dividir."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2320cd1d..9e83d33d 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2009-01-21 20:48+0000\n"
 "Last-Translator: Bruno <brunorafaelcardoso@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Comprar"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Preço: %d GP / Total: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Sair"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Efeito: %s"
@@ -48,34 +49,34 @@ msgstr "Efeito: %s"
 msgid "Shop"
 msgstr "Loja"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Vender"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Selecionar personagem"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
@@ -85,426 +86,460 @@ msgstr "Nome: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr "Nível de Trabalho: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Dinheiro: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Novo"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Próximo"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr "Ouro: %d"
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Cor do Cabelo:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Estilo do Cabelo:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Criar"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr "Selecionar Servidor"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr "OK"
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Criar"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 #, fuzzy
 msgid "Global announcement: "
 msgstr "Anúncio geral:"
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, fuzzy, c-format
 msgid "Global announcement from %s: "
 msgstr "Anúncio geral de %s:"
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurrando para %s: %s"
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+#, fuzzy
+msgid "Unknown item"
+msgstr "Comando desconhecido"
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr "Falha no Emote!"
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem nivel necessário!"
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada"
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Parece que você precisa de mais Zenyz... ;-)"
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa Skill com esse tipo de arma."
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra gema azul!"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Trocando OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr "--Ajuda--"
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: Aviso geral (Apenas GM)"
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr "/clear: limpa esta janela"
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr "/help: Mostra esta ajuda"
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 #, fuzzy
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr "/w <nick> <mensagem>: Forma mais curta para /whisper"
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr "/where: mostra o nome do mapa"
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <nick> <mensagem>: Forma mais curta para /whisper"
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr "/whisper <nick> <mensagem>: Envia uma mensagem particular"
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr "/who Mostra os jogadores online"
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr "Para mais informações, digite /help <comando>"
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr "Comandos: /announce <msg>"
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr "*** Disponivel apenas para GM's ***"
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Este comando envia uma mensagem <msg> para todos os jogadores online."
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr "Comandos: /clear"
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr "Limpa os logs do chat anterior."
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr "Exibe uma lista de todos os comandos disponiveis."
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr "Comando: /help <comando>"
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr "Exibe o conteudo de ajuda de <comando>"
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 #, fuzzy
 msgid "Command: /present"
 msgstr "Comando: /where"
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+#, fuzzy
+msgid "Command: /record <filename>"
+msgstr "Comandos: /clear"
+
+#: ../src/gui/chat.cpp:847
+#, fuzzy
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Limpa os logs do chat anterior."
+
+#: ../src/gui/chat.cpp:849
+#, fuzzy
+msgid "Command: /record"
+msgstr "Comandos: /clear"
+
+#: ../src/gui/chat.cpp:850
+#, fuzzy
+msgid "This command finishes a recording session."
+msgstr "Exibe o conteudo de ajuda de <comando>"
+
+#: ../src/gui/chat.cpp:854
 #, fuzzy
 msgid "Command: /toggle <state>"
 msgstr "Comandos: /announce <msg>"
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 #, fuzzy
 msgid "Command: /toggle"
 msgstr "Comandos: /clear"
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 #, fuzzy
 msgid "This command displays the return toggle status."
 msgstr "Mostra o nome do mapa atual."
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr "Mostra o nome do mapa atual."
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 #, fuzzy
 msgid "Command: /msg <nick> <msg>"
 msgstr "Comando: /w <nick> <msg>"
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr "Comando: /whisper <nick> <msg>"
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr "Comando: /w <nick> <msg>"
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr "Envia uma mensagem <msg> para <nick>."
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque dentro de parenteses (\")."
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr "Comando: /who"
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr "Exibe o total de jogadores online."
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr "Digite /help para uma lista de todos os comandos."
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "alto"
+
 #: ../src/gui/colour.cpp:34
 #, fuzzy
 msgid "Player"
@@ -537,15 +572,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Sim"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Não"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Conectando..."
 
@@ -553,67 +588,67 @@ msgstr "Conectando..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Usar"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Desequipar"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventório"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Equipar"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Descartar"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 #, fuzzy
 msgid "Slots: "
 msgstr "Pontos de habilidade: %d"
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr ""
 
-#: ../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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -621,11 +656,11 @@ msgstr ""
 msgid "Login"
 msgstr "Login"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Porta:"
 
@@ -633,22 +668,22 @@ msgstr "Porta:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Manter"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registrar"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -657,7 +692,7 @@ msgid "Shortcut"
 msgstr "Atalho"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Configurar"
 
@@ -665,146 +700,180 @@ msgstr "Configurar"
 msgid "MiniMap"
 msgstr "MiniMapa"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registrar"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@Negociar|Negociar com %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@atacar|Atacar %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 #, fuzzy
 msgid "@@disregard|Disregard "
 msgstr "Desconsiderado"
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@falar|Falar com NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelar|Cancelar@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pegar|Pegar %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr "@@usar|Desequipar@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@usar|Equipar@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@usar|Usar@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@descartar|Descartar@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Conectando..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Conectando..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Conectando..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Homem"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Mulher"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome do usuário tem que ser inferior a %d caracteres."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A senha deve ter pelo menos %d caracteres."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A senha deve ser menor que %d caracteres."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Erro"
 
@@ -820,48 +889,48 @@ msgstr "Volume Sfx"
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 #, fuzzy
 msgid "Colors"
 msgstr "Fechar"
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr "Jogadores"
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -901,47 +970,47 @@ msgstr "Conflitos nas teclas detectado."
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr "Relação"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr "Neutro"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr "Amigo"
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr "Desconsiderado"
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr "Salvar lista de jogadores"
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr "Permitir trocas"
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "Permitir sussuros"
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr "Quando ignorado:"
 
@@ -1002,25 +1071,25 @@ msgstr "Ambiente FX"
 msgid "Particle Detail"
 msgstr "Detalhe de partículas"
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "desligado"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "baixo"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "alto"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr "médio"
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr "máximo"
 
@@ -1058,29 +1127,21 @@ msgstr "Trocando OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
@@ -1090,44 +1151,44 @@ msgstr "É preciso reiniciar para as mudanças terem efeito."
 msgid "skills.xml"
 msgstr "Habilidades"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr "Acima"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Usar"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr "Trabalho: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr "Dinheiro: %d GP"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1135,11 +1196,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Trabalho: %d"
@@ -1148,101 +1209,101 @@ msgstr "Trabalho: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr "Status"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr "Total"
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr "Custo"
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr "Ataque:"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr "Defesa:"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr "M. Ataque:"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr "M. Defesa:"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr "% Acuracidade:"
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr "% Evasão:"
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr "% Reflexo:"
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr "Força"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr "Agilidade"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr "Vitalidade"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr "Inteligência"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr "Sorte"
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "Pontos de Status Restantes: %d"
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 #, fuzzy
 msgid "Trade: You"
 msgstr "Comércio"
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr "Comércio"
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Voc pegou %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Você dá:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
@@ -1555,51 +1616,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-#, fuzzy
-msgid "Unknown item"
-msgstr "Comando desconhecido"
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr "Sem nome"
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1675,201 +1731,377 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Tem certeza que deseja excluir este personagem?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Tem certeza que deseja excluir este personagem?"
+msgid "Attack"
+msgstr "Ataque:"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Talk"
+msgstr "Total"
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Ataque:"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "Target Player"
+msgstr "Jogadores"
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Restaurar janelas"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Dividir"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Atalho"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Restaurar janelas"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventório"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Equipamento"
+
+#: ../src/keyboardconfig.cpp:75
+#, fuzzy
+msgid "Skill Window"
+msgstr "Pontos de habilidade: %d"
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Restaurar janelas"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Restaurar janelas"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Restaurar janelas"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Falha no Emote!"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atalho"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Selecionar Servidor"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 #, fuzzy
 msgid "  -h --help       : Display this help"
 msgstr "/help: Mostra esta ajuda"
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Conectando ao servidor de contas..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Conectando ao servidor de personagens..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Conectando ao servidor de mapas..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Nome: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr "Conectando ao servidor de mapas..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr "Conectando ao servidor de personagens..."
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr "Conectando ao servidor de contas..."
 
@@ -1936,99 +2168,95 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 #, fuzzy
 msgid "Command: /party <command> <args>"
 msgstr "Comando: /help <comando>"
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Criar"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 #, fuzzy
 msgid "This command implements the partying function."
 msgstr "Exibe o conteudo de ajuda de <comando>"
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 #, fuzzy
 msgid "Command: /party new <party-name>"
 msgstr "Comandos: /announce <msg>"
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 #, fuzzy
 msgid "This command sets the party prefix character."
 msgstr "Limpa os logs do chat anterior."
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 #, fuzzy
 msgid "Command: /party prefix"
 msgstr "Comandos: /clear"
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 #, fuzzy
 msgid "This command reports the current party prefix character."
 msgstr "Limpa os logs do chat anterior."
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 #, fuzzy
 msgid "Command: /party leave"
 msgstr "Comandos: /clear"
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 #, fuzzy
 msgid "This command causes the player to leave the party."
 msgstr "Limpa os logs do chat anterior."
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 #, fuzzy
 msgid "Unknown /party command."
 msgstr "Comando desconhecido."
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 #, fuzzy
 msgid "Type /help party for a list of options."
 msgstr "Digite /help para uma lista de todos os comandos."
@@ -2074,9 +2302,6 @@ msgstr "Digite /help para uma lista de todos os comandos."
 #~ msgid "Please remove %d points"
 #~ msgstr "Por favor remova %d pontos"
 
-#~ msgid "Split"
-#~ msgstr "Dividir"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Selecionar montante de itens para dividir."
 
diff --git a/po/ru.po b/po/ru.po
index fc2dbd66..6555f13f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-01-08 11:50+0000\n"
 "Last-Translator: idle sign <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Купить"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Стоимость: %d GP / Всегоl: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Выход"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Эффект: %s"
@@ -49,34 +50,34 @@ msgstr "Эффект: %s"
 msgid "Shop"
 msgstr "Стоп"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Продать"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Выбор персонажа"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Имя: %s"
@@ -86,420 +87,449 @@ msgstr "Имя: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Уровень: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Деньги: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Новый"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Следующий"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Цвет волос:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Стрижка:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Создать"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 #, fuzzy
 msgid "Select Server"
 msgstr "Выбор персонажа"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Создать"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Переключение на OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "выс."
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -530,15 +560,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Да"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Нет"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Соединение..."
 
@@ -546,66 +576,66 @@ msgstr "Соединение..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Использовать"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Снять"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Надеть"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Сбросить"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -613,11 +643,11 @@ msgstr ""
 msgid "Login"
 msgstr "Вход"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Порт:"
 
@@ -625,22 +655,22 @@ msgstr "Порт:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Оставить"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Зарегистрироваться"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Состояние"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Умения"
 
@@ -649,7 +679,7 @@ msgid "Shortcut"
 msgstr "Клавиша"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Настройка"
 
@@ -657,146 +687,180 @@ msgstr "Настройка"
 msgid "MiniMap"
 msgstr "МиниКарта"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Зарегистрироваться"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Торговать с %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Атаковать %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Говорить с NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelОтмена@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Подобрать %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Надеть@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Надеть@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Использовать@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Сбросить@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Соединение..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Соединение..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Соединение..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr ""
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr ""
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Пароль должен содержать не менее %d символов."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Пароль не должен содержать более %d символов."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Ошибка"
 
@@ -812,47 +876,47 @@ msgstr "Громкость эффектов"
 msgid "Music volume"
 msgstr "Громкость музыки"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Применить"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Восстановить расположение окон"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Видео"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Аудио"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Джойстик"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -893,48 +957,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Имя:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -994,25 +1058,25 @@ msgstr "Эффекты окружающей среды"
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "выкл"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "низ."
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "выс."
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1050,29 +1114,21 @@ msgstr "Переключение на OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
@@ -1082,44 +1138,44 @@ msgstr "Для вступления в силу выбранных настро�
 msgid "skills.xml"
 msgstr "Умения"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Использовать"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Уровень: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Деньги: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1127,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Уровень: %d"
@@ -1140,110 +1196,110 @@ msgstr "Уровень: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "Состояние"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 #, fuzzy
 msgid "Attack:"
 msgstr "Атака %+d"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 #, fuzzy
 msgid "Defense:"
 msgstr "Защита %+d"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 #, fuzzy
 msgid "M.Attack:"
 msgstr "Атака %+d"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 #, fuzzy
 msgid "M.Defense:"
 msgstr "Защита %+d"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Сила:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Выносливость:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Живучесть:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Интеллект:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Ловкость:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Добавить"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Вы получили %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1549,50 +1605,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1666,201 +1718,374 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Вы уверены, что хотите удалить этого персонажа?"
+msgid "Attack"
+msgstr "Атака %+d"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Атака %+d"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Восстановить расположение окон"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Разделить"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Клавиша"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Восстановить расположение окон"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Состояние"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Инвентарь"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Снаряжение"
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Восстановить расположение окон"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Восстановить расположение окон"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Восстановить расположение окон"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Восстановить расположение окон"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Клавиша"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Выбор персонажа"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Имя: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Соединение..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1926,90 +2151,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Создать"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2038,9 +2259,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Снимите очки (%d)"
 
-#~ msgid "Split"
-#~ msgstr "Разделить"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Сколько предметов разделить."
 
diff --git a/po/sk.po b/po/sk.po
index 63a4b2aa..09c177ae 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Cena: %d GP / Spolu: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Ukončiť"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
@@ -48,35 +49,35 @@ msgstr "Effekt: %s"
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Potvrdte zmazanie postavy"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 #, fuzzy
 msgid "Select Character"
 msgstr "Vytvoriť postavu"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr ""
@@ -86,418 +87,446 @@ msgstr ""
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, fuzzy, c-format
 msgid "Job Level: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Peniaze: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Nový"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Vymazať"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ano"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Meno"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Farba vlasov:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Štýl vlasov:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Vytvoriť"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -526,15 +555,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr ""
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr ""
 
@@ -542,66 +571,66 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -609,11 +638,11 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr ""
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr ""
 
@@ -621,22 +650,22 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr ""
 
@@ -645,7 +674,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr ""
 
@@ -653,141 +682,173 @@ msgstr ""
 msgid "MiniMap"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 msgid "Reset"
 msgstr ""
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr ""
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+msgid "Recorder"
+msgstr ""
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+msgid "Already recording."
+msgstr ""
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 msgid "Recording..."
 msgstr ""
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr ""
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Muž"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Žena"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr ""
 
@@ -803,47 +864,47 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr ""
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -884,48 +945,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -985,25 +1046,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1040,28 +1101,20 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1069,43 +1122,43 @@ msgstr ""
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 msgid "use"
 msgstr ""
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Level: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Peniaze: %d"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1113,11 +1166,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "Level: %d"
@@ -1126,102 +1179,102 @@ msgstr "Level: %d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr ""
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Sila:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr ""
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr ""
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Inteligencia:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr ""
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1527,50 +1580,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1644,197 +1693,357 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Naozaj chcete odstrániť túto postavu?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
-#, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Naozaj chcete odstrániť túto postavu?"
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
+msgid "Sit"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
 msgstr ""
 
-#: ../src/game.cpp:784
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
 #, c-format
-msgid "Warning: guichan input exception: %s"
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:72
+msgid "Status Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:73
+msgid "Inventory Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:74
+msgid "Equipment WIndow"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
 #, c-format
-msgid "Error: Invalid update host: %s"
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+msgid "Select OK"
 msgstr ""
 
 #: ../src/main.cpp:214
+#, c-format
+msgid "Error: Invalid update host: %s"
+msgstr ""
+
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 msgid "Trying to connect to account server..."
 msgstr ""
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 msgid "Trying to connect to char server..."
 msgstr ""
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 msgid "Trying to connect to map server..."
 msgstr ""
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr ""
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1899,90 +2108,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Vytvoriť"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 35c6db70..f364b1ae 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 13:19-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2009-01-29 01:20+0100\n"
 "Last-Translator: Kess Vargavind <vargavind@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Köp"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Avsluta"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
@@ -48,34 +49,34 @@ msgstr "Effekt: %s"
 msgid "Shop"
 msgstr "Affär"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Sälj"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bekräfta borttagning av karaktär"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 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:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
@@ -85,425 +86,453 @@ msgstr "Namn: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr "Jobbnivå: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Ny"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Nästa"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr "Guld: %d"
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Skapa"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr "Välj server"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:50
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr "Ok"
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Skapa"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr "Globalt meddelande: "
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr "Globalt meddelande från %s: "
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
-#: ../src/gui/chat.cpp:357
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:392 ../src/resources/itemdb.cpp:57
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:487
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:497
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:517
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:601 ../src/gui/chat.cpp:606
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:602
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:611
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: ../src/gui/chat.cpp:623
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr "Byteshandel misslyckades!"
 
-#: ../src/gui/chat.cpp:626
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr "Kan inte visa smiley!"
 
-#: ../src/gui/chat.cpp:629
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr "Kan inte sitta ned!"
 
-#: ../src/gui/chat.cpp:632
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr "Kan inte skicka chattmeddelande!"
 
-#: ../src/gui/chat.cpp:635
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr "Kan inte ansluta till gruppen!"
 
-#: ../src/gui/chat.cpp:638
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr "Kan inte skrika!"
 
-#: ../src/gui/chat.cpp:647
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har inte nått en tillräckligt hög nivå än!"
 
-#: ../src/gui/chat.cpp:650
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr "Otillräckligt med HP!"
 
-#: ../src/gui/chat.cpp:653
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr "Otillräckligt med SP!"
 
-#: ../src/gui/chat.cpp:656
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr "Du har inga anteckningar!"
 
-#: ../src/gui/chat.cpp:659
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
-#: ../src/gui/chat.cpp:662
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Verkar som att du behöver mer zeny... ;-)"
 
-#: ../src/gui/chat.cpp:665
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Det går inte att använda den här förmågan med det där vapenslaget!"
 
-#: ../src/gui/chat.cpp:668
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd juvel!"
 
-#: ../src/gui/chat.cpp:671
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå juvel!"
 
-#: ../src/gui/chat.cpp:674
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr "Du bär på för mycket för att kunna göra det här!"
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr "Öh? Vad är det där?"
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr "Kartförflyttning misslyckades..."
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr "Kunde inte stjäla något..."
 
-#: ../src/gui/chat.cpp:692
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr "Giftet tog inte..."
 
-#: ../src/gui/chat.cpp:775
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:780
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:786
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:791
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ändrar OpenGL"
 
-#: ../src/gui/chat.cpp:801
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr "-- Hjälp --"
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: Globalt meddelande (endast GM)"
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr "/clear: Tömmer det här fönstret på text"
 
-#: ../src/gui/chat.cpp:806
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr "/help: Visar den här hjälptexten"
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:809
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr "/where: Visar namnet på kartan där du befinner dig"
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <namn> <text>: Kortare variant av /whisper"
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr "/whisper <namn> <text>: Skickar ett privat meddelande till en spelare"
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr "/who: Visar antalet inloggade spelare"
 
-#: ../src/gui/chat.cpp:818
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr "För mer information skriv /help <kommando>"
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <text>"
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr "*** endast en GM kan använda det här kommandot ***"
 
-#: ../src/gui/chat.cpp:824
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr "Det här kommandot tömmer chattloggen."
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: ../src/gui/chat.cpp:839
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr "Det här kommandot ger mer information om <kommando>."
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:848
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:846
+#, fuzzy
+msgid "Command: /record <filename>"
+msgstr "Kommando: /clear"
+
+#: ../src/gui/chat.cpp:847
+#, fuzzy
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Det här kommandot tömmer chattloggen."
+
+#: ../src/gui/chat.cpp:849
+#, fuzzy
+msgid "Command: /record"
+msgstr "Kommando: /clear"
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:859
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:862
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:866
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr "Kommando: /where"
 
-#: ../src/gui/chat.cpp:871
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr "Kommando: /whisper <namn> <text>"
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr "Kommando: /w <namn> <text>"
 
-#: ../src/gui/chat.cpp:879
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr "Det här kommandot skickar meddelandet <text> till karaktären <namn>."
 
-#: ../src/gui/chat.cpp:881
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Om <namn> innehåller mellanslag, måste du sätta citattecken (\") runt det."
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: ../src/gui/chat.cpp:887
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: ../src/gui/chat.cpp:893
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help för en lista med kommandon."
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "hög"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -534,15 +563,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Nej"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Ansluter..."
 
@@ -550,66 +579,66 @@ msgstr "Ansluter..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Använd"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Utrusta"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Släpp"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr "Utrymme: "
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:104
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr "Vikt: "
 
-#: ../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/itempopup.cpp:105
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -617,11 +646,11 @@ msgstr ""
 msgid "Login"
 msgstr "Användarnamn"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -629,22 +658,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Behåll"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registrera"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Färdigheter"
 
@@ -653,7 +682,7 @@ msgid "Shortcut"
 msgstr "Genvägar"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -661,145 +690,179 @@ msgstr "Inställningar"
 msgid "MiniMap"
 msgstr "Minikarta"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registrera"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Handla med %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attackera %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Prata med NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr "@@use|Avrusta@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Utrusta@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Använd@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Släpp@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Ansluter..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Ansluter..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Ansluter..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Man"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Kvinna"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lösenordet måste vara kortare än %d tecken."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Fel"
 
@@ -815,47 +878,47 @@ msgstr "Volym för ljudeffekter"
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Verkställ"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Ljud"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr "Spelare"
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -895,47 +958,47 @@ msgstr "Samma tangent används på flera ställen."
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr "Relation"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr "Vän"
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr "Förbisedd"
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr "Ignorerad"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr "Kom ihåg spelarlista"
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
@@ -995,25 +1058,25 @@ msgstr "Omgivande FX"
 msgid "Particle Detail"
 msgstr "Partikeldetaljer"
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "av"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "låg"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "hög"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr "medium"
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr "maximal"
 
@@ -1051,29 +1114,21 @@ msgstr "Ändrar OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
@@ -1083,44 +1138,44 @@ msgstr "Omstart krävs för att ändringarna ska synas."
 msgid "skills.xml"
 msgstr "Färdigheter"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr "Färdighetspoäng: %d"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr "Upp"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Använd"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr "Pengar: %d GP"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1128,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 msgid "Job:"
 msgstr "Jobb:"
 
@@ -1140,100 +1195,100 @@ msgstr "Jobb:"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr "Statistik"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr "Totalt"
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr "Kostnad"
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr "Attack:"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr "Försvar:"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr "M. attack:"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr "M. försvar:"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, fuzzy, c-format
 msgid "% Accuracy:"
 msgstr "% Precision:"
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, fuzzy, c-format
 msgid "% Evade:"
 msgstr "% Undvikan:"
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr "% Reflexer:"
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr "Styrka"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr "Smidighet"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr "Hälsa"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr "Intelligens"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr "Skicklighet"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr "Tur"
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "Återstående statuspoäng: %d"
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du ger:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
@@ -1654,200 +1709,376 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Är du säker på att du vill ta bort den här karaktären?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Är du säker på att du vill ta bort den här karaktären?"
+msgid "Attack"
+msgstr "Attack:"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Talk"
+msgstr "Totalt"
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Attack:"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "Target Player"
+msgstr "Spelare"
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Dela"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Genvägar"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventarium"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Utrustning"
+
+#: ../src/keyboardconfig.cpp:75
+#, fuzzy
+msgid "Skill Window"
+msgstr "Färdighetspoäng: %d"
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Kan inte visa smiley!"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Genvägar"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Välj server"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Namn: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr "Ansluter till kartservern..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr "Ansluter till karaktärsservern..."
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr "Ansluter till kontoservern..."
 
@@ -1913,90 +2144,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Skapa"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2025,9 +2252,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Var vänlig ta bort %d poäng"
 
-#~ msgid "Split"
-#~ msgstr "Dela"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Välj antal föremål att dela."
 
diff --git a/po/th.po b/po/th.po
index ac0ee488..3781df0f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2008-11-25 06:16+0000\n"
 "Last-Translator: Tharawut Paripaiboon <Unknown>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "ออก"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr ""
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr ""
@@ -48,35 +49,35 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr ""
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 #, fuzzy
 msgid "Select Character"
 msgstr "สร้างตัวละคร"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
@@ -86,418 +87,446 @@ msgstr "ชื่อ: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "สร้างใหม่"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "ถัดไป"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "สีผม:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "ทรงผม:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "สร้าง"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr ""
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr ""
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "สร้าง"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr ""
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr ""
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr ""
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr ""
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 msgid "Changing prefix to "
 msgstr ""
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr ""
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr ""
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr ""
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr ""
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr ""
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr ""
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+msgid "Command: /record <filename>"
+msgstr ""
+
+#: ../src/gui/chat.cpp:847
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+
+#: ../src/gui/chat.cpp:849
+msgid "Command: /record"
+msgstr ""
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr ""
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr ""
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr ""
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+msgid "Highlight"
+msgstr ""
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -526,15 +555,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "ใช่"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "ไม่"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
@@ -542,66 +571,66 @@ msgstr "กำลังเชื่อมต่อ..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "ใช้"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr ""
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr ""
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr ""
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr ""
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -609,11 +638,11 @@ msgstr ""
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr ""
 
@@ -621,22 +650,22 @@ msgstr ""
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr ""
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "สมัครสมาชิก"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "สถานะ"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr ""
 
@@ -645,7 +674,7 @@ msgid "Shortcut"
 msgstr ""
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "ตั้งค่า"
 
@@ -653,143 +682,177 @@ msgstr "ตั้งค่า"
 msgid "MiniMap"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "สมัครสมาชิก"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 msgid "@@trade|Trade With "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 msgid "@@attack|Attack "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "กำลังเชื่อมต่อ..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "กำลังเชื่อมต่อ..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "ชาย"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "หญิง"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "ผิดพลาด"
 
@@ -805,47 +868,47 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr ""
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr ""
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr ""
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr ""
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr ""
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr ""
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -886,48 +949,48 @@ msgstr ""
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 #, fuzzy
 msgid "Name"
 msgstr "ชื่อ:"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr ""
 
@@ -987,25 +1050,25 @@ msgstr ""
 msgid "Particle Detail"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr ""
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr ""
 
@@ -1042,28 +1105,20 @@ msgstr ""
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 msgid "Restart your client or change maps for the change to take effect."
 msgstr ""
 
@@ -1071,44 +1126,44 @@ msgstr ""
 msgid "skills.xml"
 msgstr ""
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr ""
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "ใช้"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr ""
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1116,11 +1171,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 msgid "Job:"
 msgstr ""
 
@@ -1128,106 +1183,106 @@ msgstr ""
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 #, fuzzy
 msgid "Stats"
 msgstr "สถานะ"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr ""
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr ""
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr ""
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr ""
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr ""
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr ""
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 #, fuzzy
 msgid "Strength"
 msgstr "Strength:"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 #, fuzzy
 msgid "Agility"
 msgstr "Agility:"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitality:"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence:"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dexterity:"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr ""
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr ""
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr ""
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr ""
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr ""
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -1533,50 +1588,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-msgid "Unknown item"
-msgstr ""
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1650,201 +1701,362 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:48
+msgid "Talk"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:49
+msgid "Stop Attack"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+msgid "Target Player"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+msgid "Hide Windows"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:55
+msgid "Sit"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Help Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:72
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+msgid "Status Window"
+msgstr "สถานะ"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:73
+msgid "Inventory Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:74
+msgid "Equipment WIndow"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:75
+msgid "Skill Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+msgid "Chat Window"
 msgstr ""
 
-#: ../src/game.cpp:784
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Setup Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:80
+msgid "Debug Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Emote Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
 #, c-format
-msgid "Warning: guichan input exception: %s"
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+msgid "Select OK"
+msgstr ""
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "ชื่อ: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr ""
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr ""
 
@@ -1909,90 +2121,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "สร้าง"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8c96404d..49db6d7f 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: \n"
-"POT-Creation-Date: 2009-01-28 09:34-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2009-01-21 22:42+0800\n"
 "Last-Translator: Hong Hao <oahong@gmail.com>\n"
 "Language-Team: Simplified Chinese <themanaworld-devel@lists.sourceforge."
@@ -27,24 +27,25 @@ msgstr ""
 msgid "Buy"
 msgstr "购买"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "价格：%d 金币/总数：%d 金币"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "退出"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "描述：%s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "效果：%s"
@@ -53,34 +54,34 @@ msgstr "效果：%s"
 msgid "Shop"
 msgstr "商店"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "出售"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "选择角色"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "姓名：%s"
@@ -90,427 +91,461 @@ msgstr "姓名：%s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr "职业等级：%d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "金钱：%d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "新建"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "上一个"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "下一个"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "确认"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr "金币：%d"
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "创建角色"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "姓名："
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "发色："
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "发型："
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "建立"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr "选择服务器"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:49
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr "确定"
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "建立"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 #, fuzzy
 msgid "Global announcement: "
 msgstr "全局公告："
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, fuzzy, c-format
 msgid "Global announcement from %s: "
 msgstr "%s 全局公告："
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "服务器："
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s窃窃私语：%s"
 
-#: ../src/gui/chat.cpp:352
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:485
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
+#, fuzzy
+msgid "Unknown item"
+msgstr "未知指令"
+
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:496
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:504
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:509
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:516
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:562
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:565
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:600 ../src/gui/chat.cpp:605
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:601
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:610
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr "未知指令"
 
-#: ../src/gui/chat.cpp:622
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: ../src/gui/chat.cpp:625
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: ../src/gui/chat.cpp:628
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: ../src/gui/chat.cpp:631
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: ../src/gui/chat.cpp:634
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: ../src/gui/chat.cpp:637
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: ../src/gui/chat.cpp:646
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: ../src/gui/chat.cpp:649
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: ../src/gui/chat.cpp:652
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: ../src/gui/chat.cpp:655
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: ../src/gui/chat.cpp:658
+#: ../src/gui/chat.cpp:650
 #, fuzzy
 msgid "You cannot do that right now!"
 msgstr "你现在无法办到！"
 
-#: ../src/gui/chat.cpp:661
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr "你需要更多钞票……;-)"
 
-#: ../src/gui/chat.cpp:664
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: ../src/gui/chat.cpp:667
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: ../src/gui/chat.cpp:670
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: ../src/gui/chat.cpp:673
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: ../src/gui/chat.cpp:676
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: ../src/gui/chat.cpp:685
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: ../src/gui/chat.cpp:688
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: ../src/gui/chat.cpp:691
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: ../src/gui/chat.cpp:774
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:779
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:785
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:790
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "改变成OpenGL"
 
-#: ../src/gui/chat.cpp:800
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr "-- 帮助 --"
 
-#: ../src/gui/chat.cpp:803
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: 全局通告（只有GM可使用）"
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr "/clear: 清除聊天记录"
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr "/help: 显示帮助信息"
 
-#: ../src/gui/chat.cpp:807
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 #, fuzzy
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr "/w <昵称> <信息>: /whisper的缩写形式"
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:810
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:812
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr "/where: 显示地图名称"
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <昵称> <信息>: /whisper的缩写形式"
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr "/whisper <昵称> <信息>： 发送一条私密信息 <信息> 给 <昵称>"
 
-#: ../src/gui/chat.cpp:816
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr "/who: 显示在线用户数"
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr "输入/help <指令> 获取更多帮助信息"
 
-#: ../src/gui/chat.cpp:821
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信息>"
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "该指令会发送<信息>给所有在线用户。"
 
-#: ../src/gui/chat.cpp:828
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr "该指令可清除历史聊天记录。"
 
-#: ../src/gui/chat.cpp:834
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr "该指令可显示所有可用指令。"
 
-#: ../src/gui/chat.cpp:837
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr "该指令显现<指令>的帮助信息"
 
-#: ../src/gui/chat.cpp:846
+#: ../src/gui/chat.cpp:839
 #, fuzzy
 msgid "Command: /present"
 msgstr "指令: /where"
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:857
+#: ../src/gui/chat.cpp:846
+#, fuzzy
+msgid "Command: /record <filename>"
+msgstr "指令： /clear"
+
+#: ../src/gui/chat.cpp:847
+#, fuzzy
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "该指令可清除历史聊天记录。"
+
+#: ../src/gui/chat.cpp:849
+#, fuzzy
+msgid "Command: /record"
+msgstr "指令： /clear"
+
+#: ../src/gui/chat.cpp:850
+#, fuzzy
+msgid "This command finishes a recording session."
+msgstr "该指令显现<指令>的帮助信息"
+
+#: ../src/gui/chat.cpp:854
 #, fuzzy
 msgid "Command: /toggle <state>"
 msgstr "指令： /announce <信息>"
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:861
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:864
+#: ../src/gui/chat.cpp:861
 #, fuzzy
 msgid "Command: /toggle"
 msgstr "指令： /clear"
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:862
 #, fuzzy
 msgid "This command displays the return toggle status."
 msgstr "该条指令显示当前地图名。"
 
-#: ../src/gui/chat.cpp:869
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr "该条指令显示当前地图名。"
 
-#: ../src/gui/chat.cpp:875
+#: ../src/gui/chat.cpp:872
 #, fuzzy
 msgid "Command: /msg <nick> <msg>"
 msgstr "指令： /w <昵称> <信息>"
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr "指令： /whisper <昵称> <信息>"
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr "指令： /w <昵称> <信息>"
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr "该条指令发送信息 <msg> 给 <nick>"
 
-#: ../src/gui/chat.cpp:880
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
 
-#: ../src/gui/chat.cpp:885
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr "该条指令可显现当前在线用户总数。"
 
-#: ../src/gui/chat.cpp:891
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr "未知命令"
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr "输入 /help 获取指令列表。"
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "高"
+
 #: ../src/gui/colour.cpp:34
 #, fuzzy
 msgid "Player"
@@ -543,15 +578,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "是"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "否"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "连接中..."
 
@@ -559,67 +594,67 @@ msgstr "连接中..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "使用"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "装备"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr "帮助"
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "物品栏"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "装备"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "丢弃"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 #, fuzzy
 msgid "Slots: "
 msgstr "技能点数：%d"
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:117
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 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/itempopup.cpp:118
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -627,11 +662,11 @@ msgstr ""
 msgid "Login"
 msgstr "登录"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "端口："
 
@@ -639,22 +674,22 @@ msgstr "端口："
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "保持"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "注册"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "状态"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "技能"
 
@@ -663,7 +698,7 @@ msgid "Shortcut"
 msgstr "快捷键"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "设置"
 
@@ -671,146 +706,180 @@ msgstr "设置"
 msgid "MiniMap"
 msgstr "小地图"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "注册"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@交易|与%s交易@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@攻击|攻击%s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 #, fuzzy
 msgid "@@disregard|Disregard "
 msgstr "无视"
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@谈话|和NPC谈话@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@捡起|捡起%s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr "@@使用|卸载@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@使用|装备@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@丢弃|丢弃@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "连接中..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "连接中..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "连接中..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "确认："
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "帅哥"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "美女"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符。"
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符。"
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "错误"
 
@@ -826,48 +895,48 @@ msgstr "音效声量"
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "应用"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "重置窗口"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "视频"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "音频"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "游戏杆"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "键盘"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 #, fuzzy
 msgid "Colors"
 msgstr "关闭"
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr "玩家"
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -907,48 +976,48 @@ msgstr "检测到按键冲突。"
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr "姓名"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr "关系"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr "中立"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr "好友"
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 #, fuzzy
 msgid "Disregarded"
 msgstr "无视"
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr "忽略"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr "保存玩家列表"
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "允许私语"
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -1010,25 +1079,25 @@ msgstr "雾化效果"
 msgid "Particle Detail"
 msgstr "纹理细节"
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "关闭"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "低"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "高"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr "中"
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr "最大"
 
@@ -1066,29 +1135,21 @@ msgstr "改变成OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "重启生效"
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "重启生效"
@@ -1098,44 +1159,44 @@ msgstr "重启生效"
 msgid "skills.xml"
 msgstr "技能"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr "技能点数：%d"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr "升级"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "使用"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr "金钱：%d 金币"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1143,11 +1204,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 #, fuzzy
 msgid "Job:"
 msgstr "职业：%d"
@@ -1156,101 +1217,101 @@ msgstr "职业：%d"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr "状态"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr "总计"
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr "花费"
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr "攻击:"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr "防御："
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr "魔攻："
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr "魔防："
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, c-format
 msgid "% Accuracy:"
 msgstr "% Ac精确度："
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, c-format
 msgid "% Evade:"
 msgstr "% E回避率："
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr "% 伤害反射："
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr "力量"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr "敏捷"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr "生命"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr "智慧"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr "敏捷"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr "幸运"
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "剩余状态点数：%d"
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 #, fuzzy
 msgid "Trade: You"
 msgstr "交易"
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr "交易"
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "添加"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "你得到%d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "你付出:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -1562,51 +1623,46 @@ msgstr ""
 msgid "EmoteDB: Warning, unknown emote ID %d requested"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:54
 msgid "Initializing item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:56
-#, fuzzy
-msgid "Unknown item"
-msgstr "未知指令"
-
-#: ../src/resources/itemdb.cpp:61
+#: ../src/resources/itemdb.cpp:62
 msgid "items.xml"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:66
+#: ../src/resources/itemdb.cpp:67
 msgid "ItemDB: Error while loading items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:78
+#: ../src/resources/itemdb.cpp:79
 msgid "ItemDB: Invalid or missing item ID in items.xml!"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:83
+#: ../src/resources/itemdb.cpp:84
 #, c-format
 msgid "ItemDB: Redefinition of item ID %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:101
+#: ../src/resources/itemdb.cpp:102
 msgid "Unnamed"
 msgstr "未知物品"
 
-#: ../src/resources/itemdb.cpp:146
+#: ../src/resources/itemdb.cpp:140
 #, c-format
 msgid "ItemDB: Duplicate name of item found item %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:172
+#: ../src/resources/itemdb.cpp:166
 msgid "Unloading item database..."
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:190
+#: ../src/resources/itemdb.cpp:184
 #, c-format
 msgid "ItemDB: Error, unknown item ID# %d"
 msgstr ""
 
-#: ../src/resources/itemdb.cpp:246
+#: ../src/resources/itemdb.cpp:240
 #, c-format
 msgid "ItemDB: Ignoring unknown sound event '%s'"
 msgstr ""
@@ -1682,201 +1738,377 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "你确定想删除这个角色？"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "你确定想删除这个角色？"
+msgid "Attack"
+msgstr "攻击:"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Talk"
+msgstr "总计"
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "攻击:"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "Target Player"
+msgstr "玩家"
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "重置窗口"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "分离"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "快捷键"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "重置窗口"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "状态"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "物品栏"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "装备"
+
+#: ../src/keyboardconfig.cpp:75
+#, fuzzy
+msgid "Skill Window"
+msgstr "技能点数：%d"
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "重置窗口"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "重置窗口"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "重置窗口"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "发送表情失败！"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "快捷键"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "选择服务器"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 #, fuzzy
 msgid "  -h --help       : Display this help"
 msgstr "/help: 显示帮助信息"
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "正在连接 帐号 服务器..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "正在连接 角色 服务器..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "正在连接 地图 服务器..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "姓名：%s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr "正在连接 地图 服务器..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr "正在连接 角色 服务器..."
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr "正在连接 帐号 服务器..."
 
@@ -1943,99 +2175,95 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 #, fuzzy
 msgid "Command: /party <command> <args>"
 msgstr "指令： /help <指令>"
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "建立"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 #, fuzzy
 msgid "This command implements the partying function."
 msgstr "该指令显现<指令>的帮助信息"
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 #, fuzzy
 msgid "Command: /party new <party-name>"
 msgstr "指令： /announce <信息>"
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 #, fuzzy
 msgid "This command sets the party prefix character."
 msgstr "该指令可清除历史聊天记录。"
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 #, fuzzy
 msgid "Command: /party prefix"
 msgstr "指令： /clear"
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 #, fuzzy
 msgid "This command reports the current party prefix character."
 msgstr "该指令可清除历史聊天记录。"
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 #, fuzzy
 msgid "Command: /party leave"
 msgstr "指令： /clear"
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 #, fuzzy
 msgid "This command causes the player to leave the party."
 msgstr "该指令可清除历史聊天记录。"
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 #, fuzzy
 msgid "Unknown /party command."
 msgstr "未知命令"
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 #, fuzzy
 msgid "Type /help party for a list of options."
 msgstr "输入 /help 获取指令列表。"
@@ -2081,9 +2309,6 @@ msgstr "输入 /help 获取指令列表。"
 #~ msgid "Please remove %d points"
 #~ msgstr "请删除%d点数"
 
-#~ msgid "Split"
-#~ msgstr "分离"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "请选择你分离的物品的数量"