Final translation files update for 0.0.29

27 files changed, 8563 insertions, 7961 deletions

diff --git a/po/ar.po b/po/ar.po
index d1b53ac6..14e98e87 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 11:47+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "بيع"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "إنتقاء الشخصيّة"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "جارِ الاتّصال..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "تجريد من العتاد"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "استعمال العتاد"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "استخدام"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "تسجيل"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "خارطة صغيرة"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@تجارة|متاجرة مع %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@مهاجمة|هاجم %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@إلغاء|إلغاء@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@اقتطاف|اقتطاف %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@استخدام|استخدام العتاد@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@استخدم|استخدم@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@إسقاط|إسقاط@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@قسم|قسم@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@استخدم|استخدم@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1462,24 +1475,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1775,7 +1788,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1832,203 +1845,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "تصفير النوافذ"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2240,27 +2257,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "القوّة:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "خفّة الحركة:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "نشاط:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "ذكاء:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "المهارة:"
@@ -2430,16 +2447,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2489,45 +2506,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2647,7 +2664,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2656,147 +2673,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2820,7 +2837,7 @@ msgstr "قوّة الذات:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "قوّة الذات:"
diff --git a/po/ca.po b/po/ca.po
index c17bf1c2..c494e461 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 11:46+0000\n"
 "Last-Translator: Habari <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "sortir"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr ""
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr ""
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -812,8 +812,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -953,99 +953,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1456,24 +1469,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1769,7 +1782,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1826,202 +1839,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2233,27 +2250,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2423,16 +2440,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2482,45 +2499,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2640,7 +2657,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2649,147 +2666,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2813,7 +2830,7 @@ msgstr ""
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 3b0b8763..5d3cec67 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-03-26 13:00+0000\n"
 "Last-Translator: Lubos <alvinx12@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Nápověda --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Pro více informací napište /help <příkaz>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr ""
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Prodej"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr "Správa účtu a postavy"
 msgid "Select Character"
 msgstr "Vyber postavu"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "Připojuji se..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr ""
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Vybavit"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství zboží, se kterým budete obchodovat."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství zboží, které chcete upustit."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Registrace"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -812,8 +812,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -955,99 +955,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1459,24 +1472,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1772,7 +1785,7 @@ msgstr "Globální oznámení od %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1829,202 +1842,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2236,27 +2253,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Síla:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalita:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2426,16 +2443,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2485,45 +2502,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2643,7 +2660,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2652,147 +2669,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2816,7 +2833,7 @@ msgstr ""
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 8fb074ac..0235ec65 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2008-12-28 14:45+0000\n"
 "Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -17,215 +17,215 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "--Hjælp--"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 #, fuzzy
 msgid "/help > Display this help"
 msgstr "/help: Viser denne hjælp"
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 #, fuzzy
 msgid "/where > Display map name"
 msgstr "/where: Viser bane navnet"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 #, fuzzy
 msgid "/who > Display number of online users"
 msgstr "/who: Viser antalet af online brugere"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 #, fuzzy
 msgid "/clear > Clears this window"
 msgstr "/clear: Rydder dette vindue"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 #, fuzzy
 msgid "/msg > Send a private message to a user"
 msgstr ""
 "/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 #, fuzzy
 msgid "/party > Invite a user to party"
 msgstr "@@party|Inviter %s med i dit party@@"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 #, fuzzy
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle: Bestemmer om <retur> bringer focus på chat loggen."
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 #, fuzzy
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present: Får listen af tilstedeværende brugere"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 #, fuzzy
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce: Global meddelelse (Kun for GM)"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "For at få mere information, skriv /help <kommando>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <besked>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgængelig for en GM ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne commando rydder chat loggen"
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 #, fuzzy
 msgid "Command: /join <channel>"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 #, fuzzy
 msgid "This command makes you enter <channel>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 #, fuzzy
 msgid "Command: /list"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 #, fuzzy
 msgid "This command shows a list of all channels."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 #, fuzzy
 msgid "Command: /me <message>"
 msgstr "Kommando: /announce <besked>"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 #, fuzzy
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <navn> <besked>"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 #, fuzzy
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <navn> <besked>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 #, fuzzy
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 #, fuzzy
 msgid "This command sends the text <message> to <nick>."
 msgstr "Denne kommando sender beskeden <besked> til <navn>."
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 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/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 #, fuzzy
 msgid "Command: /query <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 #, fuzzy
 msgid "Command: /q <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 #, fuzzy
 msgid "Command: /party <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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."
@@ -234,31 +234,31 @@ msgstr ""
 "lytteradius, og sender listen til enten record loggen, hvis du optager, "
 "ellers er det chat loggen."
 
-#: src/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 #, fuzzy
 msgid "Command: /record <filename>"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 #, fuzzy
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Denne commando rydder chat loggen"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 #, fuzzy
 msgid "Command: /record"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 #, fuzzy
 msgid "This command finishes a recording session."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -266,7 +266,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/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -275,64 +275,64 @@ msgstr ""
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "kommando: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 "Denne kommando viser det antal af online brugere, der nuværende er online."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 #, fuzzy
 msgid "Cannot send empty whispers!"
 msgstr "Kan ikke råbe!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
@@ -363,26 +363,26 @@ msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 msgid "Network Error"
 msgstr "Netværk Fejl"
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du gerne vil stoppe?"
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr "nej"
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer indkomne handels anmodninger"
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr "Accepter indkomne handels anmodninger"
 
@@ -434,7 +434,7 @@ msgstr "Sælg"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -541,7 +541,7 @@ msgstr "Ret konto og karakter"
 msgid "Select Character"
 msgstr "Vælg Karakter"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -607,20 +607,20 @@ msgstr "Penge: %d"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr "Til stede: "
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr "Fremmøde skrives til loggen"
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, fuzzy, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til "
@@ -641,11 +641,11 @@ msgstr "Opretter forbindelse..."
 msgid "Unable to load selection.png"
 msgstr "Kan ikke loade valgte-billede.png"
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Tag af"
@@ -687,7 +687,7 @@ msgid "Equip"
 msgstr "Tag på"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Brug"
 
@@ -709,29 +709,29 @@ msgstr " g Pladser: "
 msgid "Weight:"
 msgstr "Vægt: "
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange genstande du vil smide."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 #, fuzzy
 msgid "Select amount of items to store."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 #, fuzzy
 msgid "Select amount of items to retrieve."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Vælg hvor mange genstande du vil opdele."
 
@@ -772,7 +772,7 @@ msgid "Register"
 msgstr "Registrer"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -788,7 +788,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "MiniKort"
@@ -870,8 +870,8 @@ msgstr "Hvisk"
 msgid "Is"
 msgstr "Er"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 #, fuzzy
 msgid "Party"
 msgstr "Gruppe"
@@ -1026,101 +1026,114 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, fuzzy, c-format
+msgid "Party (%s)"
+msgstr "Gruppe"
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, fuzzy, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Byt Med "
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, fuzzy, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Angrib "
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, fuzzy, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr "@@friend|Bliv ven med "
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, fuzzy, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr "@@disregard|Se bort fra "
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, fuzzy, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr "@@ignore|Bloker "
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, fuzzy, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr "@@unignore|Fjern blokering "
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, fuzzy, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr "@@ignore|Bloker fuldstændig "
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, fuzzy, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr "@@party|Inviter %s med i dit party@@"
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|Inviter %s med i dit party@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, fuzzy, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr "@@talk|Snak Til NPC@@"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuller@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Saml Op %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 #, fuzzy
 msgid "@@use|Unequip@@"
 msgstr "@@use|Tag af@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Tag på@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Brug@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Smid@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Opdel@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@ignore|Bloker "
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1550,25 +1563,25 @@ msgstr "Partikel effekt opsætningen er ændret"
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 #, fuzzy
 msgid "skills.xml"
 msgstr "Færdigheder"
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "Færdigheds points: %d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "Op"
 
@@ -1894,7 +1907,7 @@ msgstr "Global meddelelse fra "
 msgid "%s whispers: "
 msgstr "Tillad hviskere"
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
@@ -1956,227 +1969,232 @@ msgid "Attack"
 msgstr "Angrib:"
 
 #: src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "Target & Attack"
+msgstr "Angrib:"
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Talk"
 msgstr "Total"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:49
 #, fuzzy
 msgid "Stop Attack"
 msgstr "Angrib:"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 #, fuzzy
 msgid "Target Player"
 msgstr "Bruger"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 #, fuzzy
 msgid "Hide Windows"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:55
 #, fuzzy
 msgid "Sit"
 msgstr "Opdel"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 #, fuzzy
 msgid "Screenshot"
 msgstr "Skærmbillede gemt under ~/"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 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: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:70
+#: src/keyboardconfig.cpp:71
 #, fuzzy
 msgid "Help Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 #, fuzzy
 msgid "Status Window"
 msgstr "Status"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Inventory Window"
 msgstr "Inventarliste"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 #, fuzzy
 msgid "Equipment WIndow"
 msgstr "Udstyr"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 #, fuzzy
 msgid "Skill Window"
 msgstr "Færdigheds points: %d"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 #, fuzzy
 msgid "Chat Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Setup Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 #, fuzzy
 msgid "Debug Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 #, fuzzy
 msgid "Previous Chat Tab"
 msgstr "Forrige"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 #, fuzzy
 msgid "Select OK"
 msgstr "Vælg Server"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 #, fuzzy
 msgid "Unarmed"
 msgstr "Unavngivet"
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 #, fuzzy
 msgid "Sword"
 msgstr "Lyd"
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 #, fuzzy
 msgid "Polearm"
 msgstr "Bruger"
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 #, fuzzy
 msgid "Staff"
 msgstr "Status"
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 #, fuzzy
 msgid "Whip"
 msgstr "Hvisk"
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 #, fuzzy
 msgid "Bow"
 msgstr "lav"
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 #, fuzzy
 msgid "Mace"
 msgstr "Mand"
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 #, fuzzy
 msgid "Craft"
 msgstr "Opret"
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 #, fuzzy
 msgid "Unknown Skill"
 msgstr "Ukendt genstand"
@@ -2415,27 +2433,27 @@ msgstr "Tag af"
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Styrke"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Adræthed"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Helbred"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Behændighed"
@@ -2628,17 +2646,17 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 #, fuzzy
 msgid "Unable to pick up item"
 msgstr "Kunne ikke skabe mThread"
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, fuzzy, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr "Du samlede op "
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 #, fuzzy
 msgid "Failed to use item"
 msgstr "Fejlede i at skifte til "
@@ -2695,46 +2713,46 @@ msgstr "Kunne ikke tilslutte sig gruppen!"
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 #, fuzzy
 msgid "You have left the party."
 msgstr "Du er holdt op med at være til."
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, fuzzy, c-format
 msgid "%s is not in your party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
@@ -2860,7 +2878,7 @@ msgstr "Du er en forhenværende spiller."
 msgid "You're pining for the fjords."
 msgstr "Du er tabt bag en vogn."
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr "Besked"
 
@@ -2871,151 +2889,151 @@ msgid ""
 msgstr ""
 "Du bære på mere en halvdelen af din vægt. Du kan derfor ikke genvinde liv."
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr "Du samlede op "
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr "Tag først pile på"
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Handel fejlede!"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Emote fejlede!"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Sæt dig fejlede!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Chat skabelsen fejlede!"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Kan ikke råbe!"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du er ikke nået til det rette Niveau endnu!"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "Utilstrækkelig HP!"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "Utilstrækkelig SP!"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Du har ingen memorandaer!"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Det kan du ikke gøre lige nu!"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 #, fuzzy
 msgid "Seems you need more money... ;-)"
 msgstr "Det ser ud til at du har behov for flere Zeny... ;-)"
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 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/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Du har behov for en rød krystal mere"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Du har behov for en blå krystal mere"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Du har for meget på dig, til at kunne gøre dette"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "Hmm? Hvad er det?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "Warp mislykkede..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Kunne ikke stjæle noget som helst..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr "Ansøg om lov til at handle"
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr " vil gerne handle med dig, vil du acceptere?"
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Du kan ikke handle. Handle partneren er for langt væk."
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Du kan ikke handle. Karakteren findes ikke."
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handlen blev annulleret af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr "Handel: Dig og "
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 #, fuzzy
 msgid "Trade with "
 msgstr "Handel med "
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 #, fuzzy
 msgid " cancelled"
 msgstr " afbrudt"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr "Ubehandlet handel annullerede pakken"
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Fejlede i at tilføje genstand. Handels partneren bære på for meget."
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Fejlede i at tilføje genstand. Handels partneren har ikke flere frie pladser."
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr "Handel annulleret."
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr "Handel er komplet."
 
@@ -3041,7 +3059,7 @@ msgstr "Viljestyrke:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Viljestyrke:"
diff --git a/po/de.po b/po/de.po
index d034ac8a..080392d7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-05-11 08:15+0000\n"
 "Last-Translator: Terwarf <Unknown>\n"
 "Language-Team: German\n"
@@ -17,168 +17,168 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Hilfe --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr "/help > diese Hilfe anzeigen"
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr "/where > Zeige den Namen der aktuellen Karte"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr "/me > Erzähle etwas über Dich"
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr "/clear > Löscht den Inhalt dieses Fensters"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Ersatz für msg"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr "/w > Ersatz für msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr "/q > Ersatz für query"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr "/list > Zeige alle öffentlichen Kanäle"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr "/party > Lade einen Benutzer zu deiner Party ein"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Enstscheide, ob <return> den Chat-Dialog schließt"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
 "das Log aktiviert ist)"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Um mehr Informationen zu erhalten /help <Befehel> eingeben"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Befehl: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Befehl: /help <Befehl>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Befehl: /announce <Nachricht>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** Nur für GMs verfügbar ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
 "online sind."
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Befehl: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr "Befehl: /join <Kanal>"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr "Befehl: /list"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr "Befehl: /me <Nachricht>"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr "Befehl: /msg <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr "Befehl: /whisper <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr "Befehl: /w <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
@@ -186,33 +186,33 @@ msgstr ""
 "Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
 "(\")."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr "Befehl: /query <Name>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr "Befehl: /q <Name>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
 "und Spieler <Name>."
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr "Befehl: /party <Name>"
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr "Befehl: /present"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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."
@@ -221,29 +221,29 @@ msgstr ""
 "sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
 "Chatfenster an."
 
-#: src/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr "Befehl: /record <Dateiname>"
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
 "<Dateiname>."
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr "Befehl: /record"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr "Befehl: /toggle <Status>"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -252,7 +252,7 @@ msgstr ""
 "eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
 "gedrückt wurde."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -260,43 +260,43 @@ msgstr ""
 "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  \"0\","
 "\"no\",\"false\" deaktiviert es."
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr "Befehl: /toggle"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Befehl: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Befehl: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
@@ -305,19 +305,19 @@ msgstr ""
 "Kann keinen neuen Tab für Spieler '%s' erstellen - entweder es existiert "
 "bereits einer, oder der Spieler bist Du."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
@@ -348,25 +348,25 @@ msgstr ""
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr "Nein"
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
@@ -415,7 +415,7 @@ msgstr "Verkaufen"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -521,7 +521,7 @@ msgstr "Account- und Charakterverwaltung"
 msgid "Select Character"
 msgstr "Spielfigur auswählen"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -586,20 +586,20 @@ msgstr "Geld: %s"
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr "%d Spieler sind anwesend."
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr "Anwesend: "
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr "Anwesenheitsliste wurde ins Chatlog geschrieben."
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -620,11 +620,11 @@ msgstr "Verbinde..."
 msgid "Unable to load selection.png"
 msgstr "Konnte selection.png nicht laden"
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Ablegen"
@@ -663,7 +663,7 @@ msgid "Equip"
 msgstr "Ausrüsten"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Benutzen"
 
@@ -683,27 +683,27 @@ msgstr "Plätze:"
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wieviele Gegenstände du einlagern möchtest."
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wieviele Gegenstände du wiederhaben möchtest."
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Wähle aus, wieviel Gegenstände Du aufteilen möchtest."
 
@@ -742,7 +742,7 @@ msgid "Register"
 msgstr "Registrieren"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr "Magie"
 
@@ -758,7 +758,7 @@ msgstr "Spruch 2 sprechen"
 msgid "Cast Test Spell 3"
 msgstr "Spruch 3 sprechen"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr "Karte"
 
@@ -834,8 +834,8 @@ msgstr "geflüsterte Nachricht"
 msgid "Is"
 msgstr "Handlungen"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr "Party"
 
@@ -975,99 +975,112 @@ msgstr "1/2 HP Leiste"
 msgid "1/4 HP Bar"
 msgstr "1/4 HP Leiste"
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, fuzzy, c-format
+msgid "Party (%s)"
+msgstr "Party"
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Füge Namen zu Chat hinzu@@"
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Mit %s handeln@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|%s angreifen@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr "@@friend|Füge %s@@ als Freund hinzu"
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr "@@disregard|Vernachlässige %s@@"
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr "@@ignore|Ignoriere %s@@"
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr "@@unignore|Stoppe Ignorieren von %s@@"
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr "@@guild|Lade %s in deine Gilde ein@@"
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|%s in deine Gruppe einladen@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr "@@talk|Rede mit %s@@"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Abbrechen@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Aufheben %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Zu Chat hinzufügen@@"
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@use|Ablegen@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Ausrüsten@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Nutzen@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Fallen lassen@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Aufteilen@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr "@@store|Einlagern@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr "@@retrieve|Wiederholen@@"
 
@@ -1480,24 +1493,24 @@ msgstr "Partikeleffekteinstellungen geändert."
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr "skills.xml"
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Unbekannter Skill"
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "Erhöhen"
 
@@ -1797,7 +1810,7 @@ msgstr "Globale Ansage von %s:"
 msgid "%s whispers: "
 msgstr "%s flüstert: "
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
@@ -1854,202 +1867,207 @@ msgid "Attack"
 msgstr "Angriff"
 
 #: src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "Target & Attack"
+msgstr "Angriff abbrechen"
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr "Grinsen"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:48
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:49
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target Closest"
 msgstr "Nächstes Ziel anvisieren"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr "NPC anvisieren"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Target Player"
 msgstr "Spieler anvisieren"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Hide Windows"
 msgstr "Fenster ausblenden"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:55
 msgid "Sit"
 msgstr "Sitzen"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Find Path to Mouse"
 msgstr "Finde Weg zum Mauszeiger"
 
-#: src/keyboardconfig.cpp:58 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: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 "Kurztaste %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr "Hilfefenster"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr "Ausrüstungsfenster"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr "Chatfenster"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr "Einstellungen"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr "Debugfenster"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr "Partyfenster"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:82 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: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 "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr "Im Chat runterscrollen"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr "OK auswählen"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr "Ignoriere input 1"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr "Ignoriere inpu 2"
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr "Unbewaffnet"
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr "Messer"
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr "Schwertpolearm"
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr "Waffenarm"
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr "Stab"
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr "Peitsche"
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr "Bogen"
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr "Schießen"
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr "Irrgarten"
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr "Axt"
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr "Geworfen"
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr "Handwerk"
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr "Unbekannte Fähigkeit"
 
@@ -2264,27 +2282,27 @@ msgstr "Kann Gegenstand nicht Ausrüsten."
 msgid "Unable to unequip."
 msgstr "Kann Gegenstand nicht ablegen."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Stärke: %d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Beweglichkeit: %d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Gesundheit: %d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenz: %d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Genauigkeit: %d"
@@ -2468,16 +2486,16 @@ msgstr "Teilen der Erfahrungspunkte deaktiviert."
 msgid "Experience sharing not possible."
 msgstr "Teilen der Erfahrungspunkte nicht möglich."
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr "Kann Gegenstand nicht aufheben"
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr "Du hast %s [@@%d|%s@@] aufgehoben"
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr "Konnte Gegenstand nicht benutzen"
 
@@ -2531,45 +2549,45 @@ msgstr "Konnte Party nicht erstellen."
 msgid "Party successfully created."
 msgstr "Party erfolgreich erstellt."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ist bereits Mitglied einer Party."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s ist nun Mitglied Deiner Party."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr "Du hast die Party verlassen."
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr "%s hat Deine Party verlassen."
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
@@ -2700,7 +2718,7 @@ msgstr "Du warst einmal ein Spieler."
 msgid "You're pining for the fjords."
 msgstr "Du schmachtest nach den Fjorden."
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr "Nachricht"
 
@@ -2711,150 +2729,150 @@ msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr "Aufgehoben "
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr "Zuerst solltest Du ein paar Pfeile ausrüsten"
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Handel fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Emote fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Sitzen fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Chat-Erstellung fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Kann der Gruppe nicht beitreten!"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Kann nicht rufen!"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Dein Level ist noch nicht hoch genug!"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "Nicht genug HP!"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "NIcht genug SP!"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Keine Memos vorhanden!"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Du kannst dies momentan nicht tun!"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Du brauchst noch einen roten Edelstein!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Du brauchst noch einen blauen Edelstein!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Du schleppst zuviel herum um das zu machen!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "Eha? Was ist das?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "Warp fehlgeschlagen..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Konnte nichts stehlen..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Das Gift hatte keine Wirkung..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr "Anfrage für einen Handel"
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr " möchte mit Dir Handeln, bist Du einverstanden?"
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handel nicht möglich. Spieler existiert nicht."
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel aus unbekanntem Grund abgebrochen"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr "Handeln: Du und "
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr "Handeln mit "
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr " abgebrochen"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr "Nicht verwertbare Handelsanfrage"
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartnet ist überladen."
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
 "Platz mehr."
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr "Handel abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr "Handel abgeschlossen."
 
@@ -2878,7 +2896,7 @@ msgstr "Willenskraft:"
 msgid "Topic: "
 msgstr "Thema: "
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Willenskraft: %d"
diff --git a/po/en_GB.po b/po/en_GB.po
index 436c318b..48bff4ae 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 11:48+0000\n"
 "Last-Translator: Me <Glich.Glich@googlemail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Exit"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Sell"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "Select Character"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "Connecting..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Unequip"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Equip"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Use"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Register"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "MiniMap"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Trade With %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attack %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancel@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Equip@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Drop@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Split@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1462,24 +1475,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1775,7 +1788,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1832,203 +1845,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Reset Windows"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2240,27 +2257,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Strength:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agility:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitality:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity:"
@@ -2430,16 +2447,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2489,45 +2506,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2647,7 +2664,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2656,147 +2673,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2820,7 +2837,7 @@ msgstr "Willpower:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Willpower:"
diff --git a/po/eo.po b/po/eo.po
index 60ee7d59..625817cb 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 11:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr ""
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr ""
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr ""
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -811,8 +811,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -952,99 +952,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1455,24 +1468,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1768,7 +1781,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1825,202 +1838,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2232,27 +2249,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2422,16 +2439,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2481,45 +2498,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2639,7 +2656,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2648,147 +2665,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2812,7 +2829,7 @@ msgstr ""
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 94aa9b43..661fbb32 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-05-10 15:53+0000\n"
 "Last-Translator: Jumpy <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,288 +17,288 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "ayuda"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr "/help > Muestra la ayuda"
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr "/where > Mostrar el mapa"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr "/who > Mostrar el numero de utilizadores en linea"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diga algo de Usted"
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr "/clear > Vacia la ventana"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Enviar un mensaje privado a un utilisador"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias para un Mensaje"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr "/w Alias para un mensaje"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Crea una ventana para mensajes privados con un otro utilizador"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr "/q > Alias para una demanda"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr "/list > Enseña la lista de los salones publicos"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr "/join > Entrar o crear un salon"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr "/party > Invita un jugador en un grupo"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Empieza a registrar el chat en un archivo externo"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Par mas ayuda teclea el comando /help"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "comando: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "este comando da una lista de todos los comandos que hay"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "comando: /help <comando>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "este comando muestra ayuda sobre <otro comando>"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "comando : /announce <mensaje>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "solo disponible para GM"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "este comando manda un mensaje a todos los jugadores que esten online"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "comando: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "este comando borra"
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Si <channel> no existe, lo crea"
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "si el <mote> incluye espacios , escribelo entre comillas (\"\")"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "comando: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "este comando muestra el nombre del mapa actual"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "comando: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 "este comando muestra el numero de jugadores que actualmente estan conectados"
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Orden desconocida."
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "teclea /help para una lista de comandos"
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -327,25 +327,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Salir"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -394,7 +394,7 @@ msgstr "Vender"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -500,7 +500,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "Seleccionar personaje"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -565,20 +565,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "susurrando a %s: %s"
@@ -599,11 +599,11 @@ msgstr "Conectando…"
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipo"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "quitarselo"
@@ -642,7 +642,7 @@ msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usar"
 
@@ -662,27 +662,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Seleccione objetos para comerciar."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Seleccione objetos para soltar."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Seleccione objetos para dividir."
 
@@ -721,7 +721,7 @@ msgid "Register"
 msgstr "Registrar"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -737,7 +737,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -954,99 +954,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Comerciar con %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Atacar a %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@usar|quitarselo@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Tirar@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Dividir@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1457,24 +1470,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "habilidad mis"
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "puntos de habilidad: %d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "Arriba"
 
@@ -1772,7 +1785,7 @@ msgstr "Anuncio global de %s"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1829,202 +1842,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2236,27 +2253,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Fuerza"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "agilidad2"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "vitalidad"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "inteligencia"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza"
@@ -2426,16 +2443,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2485,45 +2502,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2643,7 +2660,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2652,147 +2669,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "comercio fallido"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "emcion fallida"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "sentarse fallido"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "creacion de chat fallida"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "no pudiste unirte al grupo"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "no puedes gritar"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "no has alcanzado un nivel suficientemente alto"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "puntos de vida insuficientes"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "SP insuficientes"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "No tienes ningun memo"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "no puedes hacer eso ahora mismo"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "no puedes usar esa habilidad con este tipo de arma"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "necesitas otra gmea roja"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "necesitas otra gema azul"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "estas cargando demasiado de esto"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "¿eh? que es eso?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "teletransporte fallido"
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "No pudiste robar nada"
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "el veneno no tuvo efecto"
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2816,7 +2833,7 @@ msgstr "Fuerza de voluntad:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Fuerza de voluntad:"
diff --git a/po/fi.po b/po/fi.po
index c0b0e5b0..47a43a77 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-04-21 16:37+0000\n"
 "Last-Translator: ville-v <villev90@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Myy"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr "Tilin ja hahmojen hallinta"
 msgid "Select Character"
 msgstr "Valitse hahmo"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "Yhdistetään..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Ota käyttöön"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Käytä"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Rekisteröidy"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "Apukartta"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Hyökkää %s kimppuun@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Peruuta@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Poimi %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Ota varuste käyttöön@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Käytä@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Pudota maahan@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Pinon jako@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|Käytä@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1462,24 +1475,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Taidot"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1775,7 +1788,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1832,203 +1845,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2240,27 +2257,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Voima:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Ketteryys:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Elinvoima:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Älykkyys:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Näppäryys:"
@@ -2430,16 +2447,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2489,45 +2506,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2647,7 +2664,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2656,147 +2673,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2820,7 +2837,7 @@ msgstr "Tahdonvoima:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Tahdonvoima:"
diff --git a/po/fr.po b/po/fr.po
index 2a2d06b7..5b257a6f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-05-10 20:26+0000\n"
 "Last-Translator: Jumpy <Unknown>\n"
 "Language-Team: French\n"
@@ -18,171 +18,171 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Aide --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr "/help > Montre l'aide"
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr "/where > Affiche le nom de la carte"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr "/me > Dire quelque chose à votre propos"
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr "/clear > Vide cette fenêtre"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envoie un message privé à un utilisateur"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias de msg"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr "/w > Alias de msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Créé un nouvel onglet pour vos messages privés avec un autre "
 "utilisateur"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr "/q > Alias de query"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr "/list > Affiche une liste de tous les salons publics"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr "/join > Rejoindre ou créer un salon."
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 "/record > Commence à enregistrer la conversation dans un fichier externe"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 "/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Obtiens la liste des joueurs présents (envoyée dans l'historique "
 "du tchat s'il a été activé)"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Annonce globale (MJ uniquement)"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Pour plus d'informations sur une commande, tapez /help <commande>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Commande : /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Commande : /help <commande>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Cette commande affiche une aide sur la commande <command>."
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Commande : /announce <msg>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** uniquement disponible pour les MJ ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Commande : /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 "Cette commande vide l'historique de conversation de la conversation "
 "précédente."
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr "Commande : /join <channel>"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr "Cette commande vous fait rentrer dans le salon <channel>."
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Si <channel> n'existe pas, il sera créé."
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr "Commande : /list"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr "Cette commande affiche une liste de tous les salons publics."
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr "Commande : /me <message>"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr "Commande : /msg <nick> <message>"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr "Commande : /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr "Commande : /w <nick> <message>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr "Cette commande envoie le texte <message> au joueur <nick>"
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
@@ -190,32 +190,32 @@ msgstr ""
 "Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
 "ck\")."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr "Commande : /query <nick>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr "Commande : /q <nick>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr "Commande : /party <nick>"
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr "Cette commande invite <nick> à rejoindre votre groupe."
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr "Commande : /present"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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."
@@ -224,29 +224,29 @@ msgstr ""
 "dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
 "de la conversation."
 
-#: src/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr "Commande : /record <filename>"
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Cette commande active l'enregistrement de la conversation dans le fichier "
 "<filename>."
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr "Commande : /record"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr "Cette commande termine une session d'enregistrement."
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr "Command: /toggle <state>"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -255,7 +255,7 @@ msgstr ""
 "d'enregistrement de la conversation ou si celui-ci se fermera "
 "automatiquement."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -263,43 +263,43 @@ msgstr ""
 "<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
 "bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr "Commande : /toggle"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr "Cette commande vous affiche le status du toggle courant."
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Commande : /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Commande : /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
@@ -308,19 +308,19 @@ msgstr ""
 "Vous ne pouvez pas créer une fenêtre de dialogue privée avec '%s' ! Elle "
 "existe déjà ou il s'agit de vous même."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr "Ce message ferme la conversation."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr "La touche enter ferme la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr "Ce message ferme maintenant la conversation."
 
@@ -352,25 +352,25 @@ msgstr ""
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr "non"
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
@@ -419,7 +419,7 @@ msgstr "Vendre"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -525,7 +525,7 @@ msgstr "Gestion du compte et du personnage"
 msgid "Select Character"
 msgstr "Sélectionner votre personnnage"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -590,20 +590,20 @@ msgstr "Argent : %s"
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr "%d joueurs sont présents."
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr "Présent : "
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr "Présence inscrite dans le fichier d'enregistrement."
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
@@ -624,11 +624,11 @@ msgstr "Connexion..."
 msgid "Unable to load selection.png"
 msgstr "Impossible de charger le fichier selection.png"
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Équipement"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Retirer"
@@ -667,7 +667,7 @@ msgid "Equip"
 msgstr "Équiper"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Utiliser"
 
@@ -687,27 +687,27 @@ msgstr "Cases :"
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "Tout"
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à jeter."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr "Sélectionnez le nombre d'objets à stocker."
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr "Sélectionnez le nombre d'objet à reprendre"
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Choisissez le nombre d'objets à déplacer."
 
@@ -746,7 +746,7 @@ msgid "Register"
 msgstr "S'inscrire"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr "Magie"
 
@@ -762,7 +762,7 @@ msgstr "Jeter le sort d'essai 2"
 msgid "Cast Test Spell 3"
 msgstr "Jeter le sort d'essai 3"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr "Plan"
 
@@ -838,8 +838,8 @@ msgstr "Message privé"
 msgid "Is"
 msgstr "Est"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr "Groupe"
 
@@ -979,99 +979,112 @@ msgstr "1/2 Barre de vie"
 msgid "1/4 HP Bar"
 msgstr "1/4 Barre de vie"
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, fuzzy, c-format
+msgid "Party (%s)"
+msgstr "Groupe"
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Ajouter le nom dans la conversation@@"
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Troquer avec %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attaquer %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr "@@friend|Être ami avec %s@@"
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr "@@disregard|Négliger%s@@"
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr "@@ignore|Ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr "@@unignore|Ne plus ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr "@@ignore|Complètement ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr "@@guild|Inviter %s à rejoindre votre guilde@@"
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|Invitation de %s à joindre votre groupe@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr "@@talk|Parler à %s@@"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuler@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Ramasser %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Ajouter à la conversation@@"
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@use|Déséquiper@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Équiper@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Utiliser@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Jeter@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Partager@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr "@@store|Magasin@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr "@@retrieve|Retirer@@"
 
@@ -1485,24 +1498,24 @@ msgstr "Paramètres d'effet de particules changés."
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr "skills.xml"
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Aptitude mystérieuse"
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Compétences"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "Points de compétences : %d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "Augmenter"
 
@@ -1803,7 +1816,7 @@ msgstr "Annonce globale de %s :"
 msgid "%s whispers: "
 msgstr "Message privé de %s : "
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -1860,202 +1873,207 @@ msgid "Attack"
 msgstr "Attaquer"
 
 #: src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "Target & Attack"
+msgstr "Arrêter d'attaquer"
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:48
 msgid "Talk"
 msgstr "Parler"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:49
 msgid "Stop Attack"
 msgstr "Arrêter d'attaquer"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target Closest"
 msgstr "Cible la plus proche"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr "Cibler le PNJ"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Target Player"
 msgstr "Cibler le Joueur"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr "Ramasser"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Hide Windows"
 msgstr "Cacher les fenêtres"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:55
 msgid "Sit"
 msgstr "S'assoir"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr "Activer / Désactiver les échanges"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Find Path to Mouse"
 msgstr "Trouver le chemin vers la souris"
 
-#: src/keyboardconfig.cpp:58 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: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 "Raccourci Objet %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr "Fenêtre d'Aide"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr "Fenêtre de l'équipement"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr "Fenêtre du plan"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr "Fenêtre de conversation"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr "Fenêtre de raccourci objet"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr "Fenêtre de groupe"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d'emote"
 
-#: src/keyboardconfig.cpp:82 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: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 "Raccourci d'emote %d"
 
-#: src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr "Onglet de la conversation précédente"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr "Onglet de la conversation suivante"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr "Désarmé"
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr "Couteau"
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr "Épée"
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr "Pique"
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr "Bâton"
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr "Fouet"
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr "Arc"
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr "Tirer"
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr "Masse"
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr "Hache"
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr "Lancé"
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr "Métier"
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr "Compétence inconnue"
 
@@ -2277,27 +2295,27 @@ msgstr "Impossible d'équiper cet objet."
 msgid "Unable to unequip."
 msgstr "Impossible de deséquiper cet objet."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Force : %d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agilité : %d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalité : %d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence : %d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dextérité : %d"
@@ -2476,16 +2494,16 @@ msgstr "Partage d'expérience non authorisé."
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr "Impossible de ramasser l'objet"
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr "Vous avez ramassé %s [@@%d|%s@@]"
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr "Impossible d'utiliser cet objet"
 
@@ -2539,45 +2557,45 @@ msgstr "Le groupe n'a pu être créé."
 msgid "Party successfully created."
 msgstr "Création du groupe réussie."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s est déjà membre du groupe."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s a refusé votre invitation."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s est maintenant membre de votre groupe."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Réponse d'invitation de %s inconnue."
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr "vous avez quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr "%s a quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un membre inconnu a essayé de dire : %s"
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr "Cette manière d'inviter n'est pas en place actuellement."
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
@@ -2709,7 +2727,7 @@ msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 msgid "You're pining for the fjords."
 msgstr "Tu reposes au fond de l'eau."
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr "Message"
 
@@ -2720,151 +2738,151 @@ msgstr ""
 "Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
 "en mesure de regagner vos points de vie."
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr "Vous avez ramassé "
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr "Equiper les flêches en premier"
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Echange non réalisé !"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Emote non realisé !"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Vous n'avez pas pu vous assoir !"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Vous n'avez pas pu créer la conversation !"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vous n'avez pas encore atteind le niveau requis !"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "Pas assez de PV !"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "PV insuffisant !"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Vous n'avez pas de messages !"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez faire cela maintenant !"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire cela !"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "Hé ? Qu'est-ce donc que cela ?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "Enchainement échoué..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Vous n'avez rien pu voler..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Le poison fut sans effet..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr "Demande d'échange"
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr " souhaite troquer avec vous. Acceptez-vous ?"
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Echange impossible. Ce personnage n'existe pas."
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Echange annulé pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr "Echange : Vous et "
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr "Echanger avec "
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr " annulé"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr "Paquet de troc non pris en charge"
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 "Impossible de rajouter un objet. Votre partenaire pour cet échange est "
 "surchargé."
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
 "de place libre."
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr "Echange annulé."
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr "Echange finalisé."
 
@@ -2888,7 +2906,7 @@ msgstr "Volonté :"
 msgid "Topic: "
 msgstr "Sujet : "
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Volonté : %d"
diff --git a/po/he.po b/po/he.po
index 4be6cad4..5f49cf03 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 12:19+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "יציאה"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "מכר"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr "ניהול משתמש ושחקן"
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "מתחבר..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "ציוד"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "הורד"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "החזק"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "השתמש"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצים לפצל."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "הרשם"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "מיני-מפה"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|סחור עם %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|תקוף את %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|הזמן את %s להצטרף למסיבה@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|ביטול@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|הרם %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|החזק@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|השלך@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|פצל@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|Use@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1462,24 +1475,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "כישורים"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1775,7 +1788,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1832,203 +1845,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "אתחל חלונות"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2240,27 +2257,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "עוצמה:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "זריזות:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "חיוניות:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "תבונה:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "מיומנות:"
@@ -2430,16 +2447,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2489,45 +2506,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2647,7 +2664,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2656,147 +2673,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2820,7 +2837,7 @@ msgstr "כח רצון:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "כח רצון:"
diff --git a/po/hr.po b/po/hr.po
index 328d0a55..313051ae 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-04-21 16:37+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Pomoć --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Izlaz"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Prodaj"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr "Upravljanje Računom i Likovima"
 msgid "Select Character"
 msgstr "Odaberi lika"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -597,11 +597,11 @@ msgstr "Spajanje..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Skini opremu"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Odaberi količinu predmeta za razdvajanje."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Registriraj se"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "Karta"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Razmijeni se s %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Napadni %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Otkaži@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Uzmi %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Opremi@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Ispusti@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Razdvoji@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|Upotrijebi@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1462,24 +1475,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Vještine"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1775,7 +1788,7 @@ msgstr "Javna obavijest od %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1832,203 +1845,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Ponovno pokreni prozore"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2240,27 +2257,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Snaga:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Okretnost:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalnost:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencija:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Spretnost:"
@@ -2430,16 +2447,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2489,45 +2506,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2647,7 +2664,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2656,147 +2673,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Neuspjela razmjena!"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Neuspjelo korištenje emotea!"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Neuspjelo sjedanje!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Neuspjelo stvaranje lika!"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Neuspjelo priključivanje družini!"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Neuspjelo vikanje!"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Još nisi dosegao/la dovoljno visok nivo!"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "Nedovoljno zdravlja!"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "Nedovoljno SP-a!"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Nemaš podsjetnika!"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Ne možeš to učiniti sad!"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Ne možeš koristiti tu vještinu s tim oružjem!"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Trebaš još jedan crveni dragulj!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Trebaš još jedan plavi dragulj!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Nosiš previše predmeta da bi učinio to!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "Ha? Što je to?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "Skok nije uspio..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Krađa nije uspjela..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Otrov nije uspio..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2820,7 +2837,7 @@ msgstr "Snaga volje:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Snaga volje:"
diff --git a/po/id.po b/po/id.po
index bc219868..db9a4ff9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 12:22+0000\n"
 "Last-Translator: ActiveFile <activefile@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Jual"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "Pilih Karakter"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "Menyambung..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr ""
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Gunakan"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang mau di pisahkan"
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Mendaftar"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "MiniMap"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Dagang Dengan %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Serang%s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Batal@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Ambil %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Melengkapi@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Gunakan@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Buang@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Pisah@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|Gunakan@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1462,24 +1475,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1775,7 +1788,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1832,202 +1845,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2239,27 +2256,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Kekuatan"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Kecerdasan"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Ketangkasan"
@@ -2429,16 +2446,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2488,45 +2505,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2646,7 +2663,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2655,147 +2672,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2819,7 +2836,7 @@ msgstr "Ketekunan"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Ketekunan"
diff --git a/po/it.po b/po/it.po
index 3e011217..8b3dc78d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 12:36+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Italian\n"
@@ -19,286 +19,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -327,25 +327,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Esci"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -394,7 +394,7 @@ msgstr "Vendi"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -500,7 +500,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "Scelta Personaggio"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -565,20 +565,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -599,11 +599,11 @@ msgstr "Connessione..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Rimuovi"
@@ -642,7 +642,7 @@ msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usa"
 
@@ -662,27 +662,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
@@ -721,7 +721,7 @@ msgid "Register"
 msgstr "Registra"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -737,7 +737,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "Mini mappa"
@@ -815,8 +815,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -959,100 +959,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Scambia Con %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attacca %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancella@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipaggia@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Lascia@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Lascia@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@usa|Usa@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1464,24 +1477,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Abilità"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1777,7 +1790,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1834,203 +1847,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Resetta finestre"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2242,27 +2259,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Forza:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agilità:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalità:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenza:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Destrezza:"
@@ -2432,16 +2449,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2491,45 +2508,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2649,7 +2666,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2658,147 +2675,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2822,7 +2839,7 @@ msgstr "Volontà:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Volontà:"
diff --git a/po/ja.po b/po/ja.po
index c5cf7b61..1dfe378a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 12:31+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "終了"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "キャラを選択"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "接続しています..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr ""
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "使う"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr ""
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -812,8 +812,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -955,100 +955,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|%sを攻撃する@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|使う@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|使う@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1459,24 +1472,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1772,7 +1785,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1829,202 +1842,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2236,27 +2253,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "筋力:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "素早さ:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "体力:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "知性:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "敏捷:"
@@ -2426,16 +2443,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2485,45 +2502,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2643,7 +2660,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2652,147 +2669,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2816,7 +2833,7 @@ msgstr "精神:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "精神:"
diff --git a/po/nl.po b/po/nl.po
index 397c9c24..9837d909 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-18 16:53+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Dutch\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Commando: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Commando: /help <commando>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Commando: /announce <msg>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Commando: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Commando: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Type /help voor een lijst van commando's."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Verkopen"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "Kies Personage"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "Verbinden..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Afdoen"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Aanmelden"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "Kaartje"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Handelen met %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Annuleren@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|%s oppakken@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Uitrusten@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Neerleggen@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|Gebruiken@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1463,24 +1476,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1776,7 +1789,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1833,203 +1846,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Vensters in beginstand"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2241,27 +2258,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Sterkte:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agiliteit:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitaliteit:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligentie:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexteriteit:"
@@ -2431,16 +2448,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2490,45 +2507,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2648,7 +2665,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2657,147 +2674,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2821,7 +2838,7 @@ msgstr "Wilskracht:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Wilskracht:"
diff --git a/po/pl.po b/po/pl.po
index 21031dc6..e7308b9b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-05-10 15:42+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,199 +19,199 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Pomoc --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr "/where > Wyświetla nazwę mapy"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr "/me > Powiedz coś o sobie"
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr "/clear > Czyści to okno"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias  polecenia msg"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr "/w > Alias polecenia msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Tworzy zakładkę dla prywatnych wiadomości z innym użytkownikiem"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr "/q > Alias polecenia query"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr "/list > Pokaż wszystkie publiczne kanały"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr "/join > Dołącz lub utwórz kanał"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Rozpocznij zapisywanie czatu do zewnętrznego pliku"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Pobiera listę obecnych graczy (przesyła do dzienika czatu, jeżeli "
 "zapisywanie jest włączone)"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalne ogłoszenie (tylko GM)"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Aby uzyskać więcej informacji wpisz /help <komenda>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Komenda: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Ta komenda wyświetla listę dostępnych komend."
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Komenda: /help <komenda>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Komenda: /announce <wiadomość>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** dostępne tylko dla GM ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Komenda: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "Ta komenda czyści zawartość okna."
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr "Komenda: /join <kanał>"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr "Komenda: /list"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr "Ta komenda pokazuje listę wszystkich kanałów."
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr "Komenda: /me <wiadomość>"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr "Komenda: /msg <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr "Komenda: /whisper <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr "Komenda: /w <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr "Komenda: /query <ksywka>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr "Komenda: /q <ksywka>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Ta komeda próbuje utworzyć zakładkę dla prywatnych wiadomości pomiędzy tobą "
 "i <ksywka>."
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr "Komenda: /party <ksywka>"
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr "Komenda: /present"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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."
@@ -219,28 +219,28 @@ msgstr ""
 "Ta komenda pobiera listę graczy w zasięgu słuchu i wysyła ją do dziennika "
 "zapisu, lub dziennika czatu."
 
-#: src/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr "Komenda: /record <nazwa_pliku>"
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr "Komenda: /record"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr "Ta komenda kończy zapisywanie sesji"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr "Komenda: /toggle <stan>"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -248,7 +248,7 @@ msgstr ""
 "Ta komenda ustawia, czy klawisz return powinien włączać dziennik zapisu, lub "
 "czy dziennik zapisu powinien się automatycznie wyłączyć."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -256,62 +256,62 @@ msgstr ""
 "<stan> może być jednym z \"1\", \"yes\", \"true\" aby uaktywnić przełącznik, "
 "lub \"0\", \"no\", \"false\" by deaktywować przełącznik."
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr "Komenda: /toggle"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr "Ta komenda wyświetla status przełącznika"
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Komenda: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Komenda: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Wpisz /help aby usyskać listę komend."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
@@ -340,25 +340,25 @@ msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr "nie"
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
@@ -407,7 +407,7 @@ msgstr "Sprzedaj"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -513,7 +513,7 @@ msgstr "Zarządzanie kontem i postaciami"
 msgid "Select Character"
 msgstr "Wybierz postać"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -578,20 +578,20 @@ msgstr "Pieniądze: %s"
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr "Obecny: "
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr "Dozór wpisany do dziennika zapisu"
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -612,11 +612,11 @@ msgstr "Łączenie..."
 msgid "Unable to load selection.png"
 msgstr "Nie można załadować selection.png"
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Ekwipunek"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Zdejmij"
@@ -655,7 +655,7 @@ msgid "Equip"
 msgstr "Załóż"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Użyj"
 
@@ -675,27 +675,27 @@ msgstr "Miejsc:"
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "wszystkie"
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr "Wybierz ilość przedmiotów do przechowania."
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
@@ -734,7 +734,7 @@ msgid "Register"
 msgstr "Rejestruj"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr "Magia"
 
@@ -750,7 +750,7 @@ msgstr "Test Rzucania Zaklęcia 2"
 msgid "Cast Test Spell 3"
 msgstr "Test Rzucania Zaklęcia 3"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -826,8 +826,8 @@ msgstr "Szept"
 msgid "Is"
 msgstr "Jest"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr "Grupa"
 
@@ -967,99 +967,112 @@ msgstr "1/2 Paska HP"
 msgid "1/4 HP Bar"
 msgstr "1/4 Paska HP"
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, fuzzy, c-format
+msgid "Party (%s)"
+msgstr "Grupa"
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Dodaj imię do czatu@@"
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Handel z %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Atakuj %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr "@@friend|Zaprzyjaźnij się z %s@@"
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr "@@disregard|Lekceważ %s@@"
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr "@@ignore|Ignoruj %s@@"
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr "@@unignore|Przestań Ignorować %s@@"
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr "@@guild|Zaproś %s aby dołączył do twojej gildii@@"
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|Zaproś %s do grupy@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr "@@talk|Rozmawiaj z %s@@"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Anuluj@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@use|Zdejmij@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Załóż@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Użyj@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Upuść@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Rozdziel@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1470,24 +1483,24 @@ msgstr "Zmieniono ustawienia efektów cząsteczek"
 msgid "Changes will take effect on map change."
 msgstr "Zmiany nastąpią po zmianie mapy."
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr "skills.xml"
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Tajemnicza umiejętność"
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Zdolności"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "Punkty umiejętności: %d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "Góra"
 
@@ -1785,7 +1798,7 @@ msgstr "Ogłoszenie ogólne od %s:"
 msgid "%s whispers: "
 msgstr "%s szepcze: "
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
@@ -1842,202 +1855,207 @@ msgid "Attack"
 msgstr "Atak"
 
 #: src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "Target & Attack"
+msgstr "Zatrzymaj Atak"
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr "Emotikonka"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:48
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:49
 msgid "Stop Attack"
 msgstr "Zatrzymaj Atak"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target Closest"
 msgstr "Namierz najbliższy cel"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr "Namierz NPC"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Target Player"
 msgstr "Namierz Gracza"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr "Podnieś"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Hide Windows"
 msgstr "Ukryj Okna"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:55
 msgid "Sit"
 msgstr "Usiądź"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Find Path to Mouse"
 msgstr "Znajdź Ścieżkę do Myszy"
 
-#: src/keyboardconfig.cpp:58 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: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 "Skrót Przedmiotu %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr "Okno Pomocy"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr "Okno statusu"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr "Okno Inwentarza"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr "Okno Ekwipunku"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr "Okno Minimapy"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr "Okno Czatu"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr "Okno Skrótów Przedmiotów"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr "Okno Ustawień"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr "Okno diagnostyczne"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr "Okno Skrótów Emotek"
 
-#: src/keyboardconfig.cpp:82 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: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 "Skrót Emotki %d"
 
-#: src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr "Nieuzbrojony"
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr "Nóż"
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr "Miecz"
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr "Kij"
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr "Laska"
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr "Bat"
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr "Łuk"
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr "Strzelectwo"
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr "Maczuga"
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr "Topór"
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr "Rzucana"
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr "Rrzemiosło"
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr "Nieznana Umiejętność"
 
@@ -2250,27 +2268,27 @@ msgstr "Nie można założyć."
 msgid "Unable to unequip."
 msgstr "Nie można zdjąć."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Siła: %d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Zwinność: %d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Witalność: %d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencja: %d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Zręczność: %d"
@@ -2445,16 +2463,16 @@ msgstr "Podział doświadczenia wyłączony."
 msgid "Experience sharing not possible."
 msgstr "Podział doświadczenia nie jest możliwy."
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr "Nie można podnieść przedmiotu"
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr "Użycie przedmiotu nie powiodło się"
 
@@ -2506,45 +2524,45 @@ msgstr "Nie można utworzyć grupy."
 msgid "Party successfully created."
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s już jest członkiem grupy."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s odmówił zaproszenia."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s jest od teraz członkiem twojej grupy."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Nieznana odpowiedź na zaproszenie dla %s"
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr "Opuściłeś grupę."
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr "%s opuścił twoją grupę."
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Nieznany członek próbował powiedzieć: %s"
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
@@ -2668,7 +2686,7 @@ msgstr "Jesteś ex-graczem."
 msgid "You're pining for the fjords."
 msgstr "Usychasz z tęsknoty za fiordami."
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr "Wiadomość"
 
@@ -2677,148 +2695,148 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nosisz więcej, niż połowa twojej wagi. Nie możesz odzyskiwać zdrowia."
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr "Podniosłeś "
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr "Najpierw załóż strzały"
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Handel zakończony niepowodzeniem!"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Emotka nieudana!"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Siad nieudany!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Utworzenie czatu nieudane!"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Nie można dołączyć do grupy!"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Nie można krzyknąć!"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Masz za niski poziom!"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "Niewystarczające HP!"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "Niewystarczające SP!"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Nie masz notatek!"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Nie możesz teraz tego zrobić!"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr "Wygląda na to, że potrzebujesz wiecej pieniędzy... ;-)"
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nie można użyć tej umiejętności z taką bronią!"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego kamienia!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego kamienia!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Jesteś zbyt obciążony aby to zrobić!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "O! Co to?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Nie mogę nic ukraść..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr "Prośba o handel"
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr " chce handlować z tobą, zgadzasz się?"
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Handlowanie nie jest możlwe. Kontrahent jest za daleko."
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handlowanie nie jest możliwe. Postać nie istnieje."
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel anulowany z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr "Handel: Ty i "
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr "Handel z "
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr " anulował"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr "Nieobsługiwany pakiet anulowania handlu"
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Dodanie przedmiotu nie powiodło się. Kontrahent jest przeciążony."
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Kontrahent nie posiada wolnego miejsca."
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr "Handel anulowany."
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr "Handel zakończony."
 
@@ -2842,7 +2860,7 @@ msgstr "Siła woli:"
 msgid "Topic: "
 msgstr "Temat: "
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Siłą woli: %d"
diff --git a/po/pt.po b/po/pt.po
index a0b117f2..bd528095 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 12:36+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Sair"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Vender"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "Seleccione um Personagem"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "Conectando..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Desequipar"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usar"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Seleccionar a quantidade de itens a largar."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Seleccionar a quantidade de itens a dividir."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Registo"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Negociar com %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Apanhar %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Equipar@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Largar@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Dividir@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@use|Usar@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1462,24 +1475,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Competências"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1775,7 +1788,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1832,203 +1845,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Reiniciar Janelas"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2240,27 +2257,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Força:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agilidade:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalidade:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligência:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza:"
@@ -2432,16 +2449,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2491,45 +2508,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2649,7 +2666,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2658,147 +2675,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2822,7 +2839,7 @@ msgstr "Força de Vontade:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Força de Vontade:"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 80cfae41..f18f1200 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-21 20:48+0000\n"
 "Last-Translator: Bruno <brunorafaelcardoso@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "--Ajuda--"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Para mais informações, digite /help <comando>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Exibe uma lista de todos os comandos disponiveis."
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Comando: /help <comando>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Exibe o conteudo de ajuda de <comando>"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Comandos: /announce <msg>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** Disponivel apenas para GM's ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 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/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Comandos: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "Limpa os logs do chat anterior."
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque dentro de parenteses (\")."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "Mostra o nome do mapa atual."
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Comando: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr "Exibe o total de jogadores online."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Digite /help para uma lista de todos os comandos."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Sair"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Vender"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr "Gerenciamento de Conta e Personagem"
 msgid "Select Character"
 msgstr "Selecionar personagem"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurrando para %s: %s"
@@ -597,11 +597,11 @@ msgstr "Conectando..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Desequipar"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Equipar"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Usar"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Selecionar montante de itens para negociar."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Selecionar montante de itens para descartar."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Selecionar montante de itens para dividir."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Registrar"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,100 +957,113 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@Negociar|Negociar com %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@atacar|Atacar %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelar|Cancelar@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pegar|Pegar %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@usar|Desequipar@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@usar|Equipar@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@usar|Usar@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@descartar|Descartar@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@dividir|Dividir@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@usar|Usar@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1463,24 +1476,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Habilidade Mistério"
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Habilidades"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "Pontos de habilidade: %d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "Acima"
 
@@ -1777,7 +1790,7 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1834,203 +1847,207 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Restaurar janelas"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2242,27 +2259,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Força"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agilidade"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalidade"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligência"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza"
@@ -2432,16 +2449,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2491,45 +2508,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2649,7 +2666,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2658,147 +2675,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Falha no Emote!"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem nivel necessário!"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 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/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra gema azul!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2822,7 +2839,7 @@ msgstr "Força de Vontade:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Força de Vontade:"
diff --git a/po/ru.po b/po/ru.po
index 541c9811..30d43384 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-05-11 20:01+0000\n"
 "Last-Translator: Koptev Oleg <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Помощь --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr "/help > Отображает этото текст"
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr "/where > Отображает имя карты"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr "/who > Отображает количество пользователей он-лайн"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr "/me > Расскажите что-нибудь о себе"
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr "/clear > Очищает это окно"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Послать приватное сообщение пользователю"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Вариант команды msg"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr "/w > Вариант команды msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr "/join > Создать или присоединиться к каналу"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr "Пригласить пользователя на канал"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Записывать чат во внешний файл"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Чтобы получить больше информации, наберите /help <команда>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Команда: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Эта команда показывает список доступных команд"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Команда: /help <команда>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Эта команда показывает помощь по <команде>."
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Команда: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "Эта команда очищает лог чата."
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr "Команда: /join <канал>"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr "Команда для входа на <канал>."
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Если <канал> не существует, он будет создан."
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr "Команда: /list"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr "Эта команда показывает список всех каналов."
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr "Команда: /w <ник> <сообщение>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Команда: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "Эта команда показывает имя текущей карты."
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Команда: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Неизвесная команда"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Введите /help для получения списка команд."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Выход"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Продать"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr "Выбор персонажа"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "Соединение..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Снаряжение"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Снять"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Надеть"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Использовать"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Зарегистрироваться"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -811,8 +811,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -952,99 +952,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Торговать с %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Атаковать %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancelОтмена@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Надеть@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Использовать@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Сбросить@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Разделить@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1455,24 +1468,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1768,7 +1781,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1825,202 +1838,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2232,27 +2249,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Сила"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Выносливость:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Живучесть:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Интеллект"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Ловкость"
@@ -2422,16 +2439,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2481,45 +2498,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2639,7 +2656,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2648,147 +2665,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2812,7 +2829,7 @@ msgstr "Сила волиr:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Сила волиr:"
diff --git a/po/sk.po b/po/sk.po
index 5ed1556d..e9fd479e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-04-07 18:10+0000\n"
 "Last-Translator: Dalanos <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Pomoc --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "Pre viac informácií, napíšte /help <príkaz>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Príkaz: /hel"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Tento príkaz zobrazí zoznam veštkých prístupných príkazov."
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Príkaz: /help <príkaz>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Tento príkaz zobrazí nápovedu pre <príkaz>."
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** prístupné iba pre GM ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Tento príkaz pošle správu <správa> všetkým pripojeným používateľom."
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Príkaz: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Príkaz: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "Tento príkaz zobrazí meno aktuálne mapy."
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Príkaz: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Neznámy príkaz."
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Napíš /help pre zoznam príkazov."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr "Predaj"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr "Účet a správa postáv"
 msgid "Select Character"
 msgstr "Vyberte postavu"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -597,11 +597,11 @@ msgstr "Pripájam sa..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Vybavenie"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Odstrojiť"
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr "Vystrojiť"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Použiť"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "Registrovať"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -957,99 +957,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@obchod|Obchodovať s %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@útok|Útok %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@zrušiť|Zrušiť@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@použiť|Odstrojiť@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1461,24 +1474,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Schopnosti"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1774,7 +1787,7 @@ msgstr "Globálne oznámenie od %s:"
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1831,202 +1844,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2238,27 +2255,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Sila:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencia:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2428,16 +2445,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2487,45 +2504,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2645,7 +2662,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2654,147 +2671,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Obchod sa nepodaril!"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Zobrazenie smajlíka sa nepodarilo!"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Sadnutie sa nepodarilo!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Nie je možné  vstúpiť do párty!"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Nemôžem kričať!"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Ešte si nedosiahol dostatočne vysokú úroveť!"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "Nedostatok HP!"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "Nedostatok SP!"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Nemáš žiadne poznámky!"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Práve teraz to nemôžeš robiť."
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemôžeš použiť túto zručnosť s touto zbraňou!"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Potrebuješ ďaľší červený gem!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Potrebuješ ďaľší modrý gem!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "Nosíš veľa, aby si mohol spraviť toto!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "Heh? Čo to je?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "Warp sa nepodaril ..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Nedá sa kradnúť ..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Jed nemá žiaden účinnok ..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2818,7 +2835,7 @@ msgstr ""
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 51b17695..90774e5b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-04-22 11:32+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,200 +17,200 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- Hjälp --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 #, fuzzy
 msgid "/help > Display this help"
 msgstr "/help > Visa den här hjälpen"
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr "/where > Visa kartans namn"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr "/who > Visa antalet inloggade spelare"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr "/me > Säg något om dig själv"
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr "/clear > Tömmer det här fönstret"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Skickar ett privat meddelande till en spelare"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias för msg"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr "/w > Alias för msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Skapar en flik för privata meddelanden med en annan spelare"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr "/q > Alias för query"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr "/list > Visa alla offentliga chattkanaler"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr "/join > Gå med i eller skapa en chattkanal"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Påbörja loggning av chatten till en extern fil"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Lista närvarande spelare (sänds till chattloggen om loggning är "
 "aktiverad)"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalt meddelande (endast för GM)"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "För mer information skriv /help <kommando>"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "Det här kommandot ger mer information om <kommando>."
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <text>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** endast en GM kan använda det här kommandot ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 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/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "Det här kommandot tömmer chattloggen."
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr "Kommando: /join <chattkanal>"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr "Det här kommandot låter dig gå in i <chattkanal>."
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Om <chattkanal> inte existerar, skapas den."
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr "Kommando: /list"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr "Det här kommandot visar en lista över alla chattkanaler."
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr "Kommando: /me <meddelande>"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Det här kommandet berättar för andra att du är/gör <meddelande>."
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr "Det här kommandot skickar <meddelande> till <spelare>."
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr "Kommando: /query <spelare>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr "Kommando: /q <spelare>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Det här kommandot försöker att skapa en flik för viskningar mellan dig och "
 "<spelare>."
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr "Kommando: /party <spelare>"
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr "Det här kommandot bjuder in <spelare> till din grupp."
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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."
@@ -218,27 +218,27 @@ msgstr ""
 "Det här kommandot ger en lista över spelare som finns inom höravstånd, om "
 "loggning av chatten är aktiverad skickas listan till loggfilen."
 
-#: src/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr "Kommando: /record <filnamn>"
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr "Kommando: /record"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr "Det här kommandot slutar loggning av chatten."
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr "Kommando: /toggle <tillstånd>"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -246,7 +246,7 @@ msgstr ""
 "Det här kommandot anger huruvida retur visar/döljerer chattfönstret eller om "
 "chattfönstret stänger sig själv."
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -254,44 +254,44 @@ msgstr ""
 "<tillstånd> kan vara ”1”, ”yes” eller ”true” för att använda returtangenten "
 "eller ”0”, ”no” eller ”false” för att använda automatisk stängning."
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr "Det här kommandot visar tillståndet för huruvida retur används."
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "Kommando: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 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/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help för en lista med kommandon."
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 #, fuzzy
 msgid "Cannot send empty whispers!"
 msgstr "Kan inte skicka tomma viskningar!"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, fuzzy, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
@@ -300,19 +300,19 @@ msgstr ""
 "Kan inte skapa en ny flik för viskningar till spelaren ”%s”! Antingen finns "
 "den fliken redan eller så angav du dig själv."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr "Retur visar/döljer chattfönstret."
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr "Meddelande stänger chattfönstret."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
@@ -342,25 +342,25 @@ msgstr ""
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr "nej"
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
@@ -409,7 +409,7 @@ msgstr "Sälj"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -515,7 +515,7 @@ msgstr "Hantering av konto och karaktärer"
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -580,20 +580,20 @@ msgstr "Pengar: %s"
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr "Närvarande: "
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr "Närvaro loggades till fil."
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -614,11 +614,11 @@ msgstr "Ansluter..."
 msgid "Unable to load selection.png"
 msgstr "Kan inte ladda selection.png"
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "Avrusta"
@@ -657,7 +657,7 @@ msgid "Equip"
 msgstr "Utrusta"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "Använd"
 
@@ -677,27 +677,27 @@ msgstr "Utrymme:"
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "Alla"
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr "Välj antal att lagra."
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr "Vaälja antal att hämta."
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
@@ -736,7 +736,7 @@ msgid "Register"
 msgstr "Registrera"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr "Magi"
 
@@ -752,7 +752,7 @@ msgstr "Använd testmagi 2"
 msgid "Cast Test Spell 3"
 msgstr "Använd testmagi 3"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 #, fuzzy
 msgid "Map"
 msgstr "Max"
@@ -830,8 +830,8 @@ msgstr "Viskning"
 msgid "Is"
 msgstr "Är"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr "Grupp"
 
@@ -979,101 +979,114 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, fuzzy, c-format
+msgid "Party (%s)"
+msgstr "Grupp"
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|Använd namn i chatt@@"
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@trade|Handla med %s@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@attack|Attackera %s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr "@@friend|Lägg till %s som vän@@"
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr "@@disregard|Strunta i %s@@"
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr "@@ignore|Ignorera %s@@"
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr "@@unignore|Sluta ignorera %s@@"
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr "@@ignore|Ignorera %s fullständigt@@"
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr "@@guild|Bjud in %s till ditt gille@@"
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|Bjud in %s till din grupp@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr "@@talk|Prata med %s@@"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, fuzzy, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 #, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Lägg till chatt@@"
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@use|Avrusta@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@use|Utrusta@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@use|Använd@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Släpp@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@split|Dela@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 #, fuzzy
 msgid "@@store|Store@@"
 msgstr "@@ignore|Ignorera %s@@"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1486,24 +1499,24 @@ msgstr "Inställningar för partikeleffekter ändrade."
 msgid "Changes will take effect on map change."
 msgstr "Förändringar kommer att börja gälla när du byter karta."
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "Mystisk förmåga"
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "Färdighetspoäng: %d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "Upp"
 
@@ -1804,7 +1817,7 @@ msgstr "Globalt meddelande från %s:"
 msgid "%s whispers: "
 msgstr "%s viskar: "
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1861,203 +1874,208 @@ msgid "Attack"
 msgstr "Attackera"
 
 #: src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "Target & Attack"
+msgstr "Sluta attackera"
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:48
 msgid "Talk"
 msgstr "Prata"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:49
 msgid "Stop Attack"
 msgstr "Sluta attackera"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr "Plocka upp"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Hide Windows"
 msgstr "Dölj fönster"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:55
 msgid "Sit"
 msgstr "Sitt"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr "Hjälpfönster"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr "Statusfönster"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr "Inventorium"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr "Minikarta"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr "Chattfönster"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 #, fuzzy
 msgid "Party Window"
 msgstr "Chattfönster"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr "Rulla upp chatt"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr "Rulla ned chatt"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr "Föregående chattflik"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr "Kniv"
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr "Svärd"
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr "Spjut"
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr "Stav"
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr "Piska"
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr "Båge"
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr "Skjutvapen"
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr "Spikklubba"
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr "Yxa"
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr "Kastvapen"
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2282,27 +2300,27 @@ msgstr "Kan inte utrusta."
 msgid "Unable to unequip."
 msgstr "Kan inte avrusta."
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Styrka: %d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Smidighet"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Livskraft: %d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens: %d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Skicklighet"
@@ -2472,16 +2490,16 @@ msgstr "Fördelning av erfarenhet inaktiverad."
 msgid "Experience sharing not possible."
 msgstr "Fördelning av erfarenhet ej möjlig."
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, fuzzy, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr "Du plockade upp %s [%s]."
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2531,45 +2549,45 @@ msgstr "Kunde inte skapa grupp."
 msgid "Party successfully created."
 msgstr "Grupp skapad."
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s är redan medlem i en grupp."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s avvisade din inbjudan."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s är nu en medlem i din grupp."
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr "Du har lämnat gruppen."
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr "%s har lämnat din grupp."
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "En okänd medlem försökte säga: %s"
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s är inte med i din grupp!"
@@ -2695,7 +2713,7 @@ msgstr "Du är en före detta spelare."
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr "Meddelande"
 
@@ -2704,147 +2722,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär mer än halva din vikt på dig. Du kan inte återfå hälsa."
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr "Du plockade upp "
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr "Utrusta dig med pilar först."
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "Byteshandel misslyckades!"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "Kan inte visa smiley!"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "Kan inte sitta ned!"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "Kan inte skicka chattmeddelande!"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "Kan inte ansluta till gruppen!"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "Kan inte skrika!"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har inte nått en tillräckligt hög nivå än!"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "Otillräckligt med HP!"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "Otillräckligt med SP!"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "Du har inga anteckningar!"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer pengar… ;-)"
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 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/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd juvel!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå juvel!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 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/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "Öh? Vad är det där?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "Kartförflyttning misslyckades..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "Kunde inte stjäla något..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "Giftet tog inte..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr "Erbjudande till byteshandel"
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr " vill handla med dig, är det okej?"
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Byteshandel är inte möjligt. Handelspartnern är för långt borta."
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Byteshandel är inte möjligt. Karaktären existerar inte."
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Byteshandel avbröts av okänd anledning."
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr "Byteshandel mellan dig och "
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr "Byteshandla med "
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr "Byteshandel avbruten."
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr "Byteshandel genomförd."
 
@@ -2868,7 +2886,7 @@ msgstr "Viljestyrka:"
 msgid "Topic: "
 msgstr "Ämne: "
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Viljestyrka:"
diff --git a/po/th.po b/po/th.po
index 10d32605..b3852c34 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-09 12:37+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -325,25 +325,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "ออก"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -498,7 +498,7 @@ msgstr ""
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -563,20 +563,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -597,11 +597,11 @@ msgstr "กำลังเชื่อมต่อ..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr ""
@@ -640,7 +640,7 @@ msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "ใช้"
 
@@ -660,27 +660,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -719,7 +719,7 @@ msgid "Register"
 msgstr "สมัครสมาชิก"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -812,8 +812,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -955,99 +955,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1458,24 +1471,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1771,7 +1784,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1828,202 +1841,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2235,27 +2252,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Strength:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agility:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitality:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity:"
@@ -2425,16 +2442,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2484,45 +2501,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2642,7 +2659,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2651,147 +2668,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2815,7 +2832,7 @@ msgstr "Willpower:"
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Willpower:"
diff --git a/po/tmw.pot b/po/tmw.pot
index 41b215cc..2da599f0 100644
--- a/po/tmw.pot
+++ b/po/tmw.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,286 +16,286 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 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/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
@@ -324,25 +324,25 @@ msgstr ""
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr ""
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -391,7 +391,7 @@ msgstr ""
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -497,7 +497,7 @@ msgstr ""
 msgid "Select Character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -562,20 +562,20 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:333
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
-#: src/gui/chat.cpp:350
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:475
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -596,11 +596,11 @@ msgstr ""
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr ""
@@ -639,7 +639,7 @@ msgid "Equip"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr ""
 
@@ -659,27 +659,27 @@ msgstr ""
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr ""
 
@@ -718,7 +718,7 @@ msgid "Register"
 msgstr ""
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:848
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -734,7 +734,7 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr ""
 
@@ -810,8 +810,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -951,99 +951,112 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1454,24 +1467,24 @@ msgstr ""
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr ""
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr ""
 
@@ -1767,7 +1780,7 @@ msgstr ""
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1824,202 +1837,206 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
@@ -2231,27 +2248,27 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
@@ -2421,16 +2438,16 @@ msgstr ""
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
@@ -2480,45 +2497,45 @@ msgstr ""
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:239
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:274
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:300
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
@@ -2638,7 +2655,7 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
@@ -2647,147 +2664,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2811,7 +2828,7 @@ msgstr ""
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:86
+#: src/net/tmwserv/generalhandler.cpp:87
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6c1e89bc..79608dd8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-01-25 23:09+0000\n"
 "Last-Translator: Hong Hao <Unknown>\n"
-"Language-Team: Simplified Chinese <themanaworld-"
-"devel@lists.sourceforge.net>\n"
+"Language-Team: Simplified Chinese <themanaworld-devel@lists.sourceforge."
+"net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,917 +25,8 @@ msgstr ""
 msgid "-- Help --"
 msgstr "-- 帮助 --"
 
-#: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
-msgstr "输入/help <指令> 获取更多帮助信息"
-
-#: src/commandhandler.cpp:174
-msgid "Command: /help"
-msgstr "指令： /help"
-
-#: src/commandhandler.cpp:175
-msgid "This command displays a list of all commands available."
-msgstr "该指令可显示所有可用指令。"
-
-#: src/commandhandler.cpp:176
-msgid "Command: /help <command>"
-msgstr "指令： /help <指令>"
-
-#: src/commandhandler.cpp:177
-msgid "This command displays help on <command>."
-msgstr "该指令显现<指令>的帮助信息"
-
-#: src/commandhandler.cpp:185
-msgid "Command: /announce <msg>"
-msgstr "指令： /announce <信息>"
-
-#: src/commandhandler.cpp:186
-msgid "*** only available to a GM ***"
-msgstr "*** 只有GM可用 ***"
-
-#: src/commandhandler.cpp:187
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "该指令会发送<信息>给所有在线用户。"
-
-#: src/commandhandler.cpp:192
-msgid "Command: /clear"
-msgstr "指令： /clear"
-
-#: src/commandhandler.cpp:193
-msgid "This command clears the chat log of previous chat."
-msgstr "该指令可清除历史聊天记录。"
-
-#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
-#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:77
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
-
-#: src/commandhandler.cpp:262
-msgid "Command: /where"
-msgstr "指令: /where"
-
-#: src/commandhandler.cpp:263
-msgid "This command displays the name of the current map."
-msgstr "该条指令显示当前地图名。"
-
-#: src/commandhandler.cpp:267
-msgid "Command: /who"
-msgstr "指令： /who"
-
-#: src/commandhandler.cpp:268
-msgid "This command displays the number of players currently online."
-msgstr "该条指令可显现当前在线用户总数。"
-
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr "未知命令"
-
-#: src/commandhandler.cpp:274
-msgid "Type /help for a list of commands."
-msgstr "输入 /help 获取指令列表。"
-
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
-msgid "Quit"
-msgstr "退出"
-
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:39
-msgid "Buy"
-msgstr "购买"
-
-#: src/gui/buy.cpp:73 src/gui/buy.cpp:223 src/gui/buy.cpp:241
-#: src/gui/sell.cpp:75 src/gui/sell.cpp:249 src/gui/sell.cpp:263
-#, c-format
-msgid "Description: %s"
-msgstr "描述：%s"
-
-#: src/gui/buy.cpp:74 src/gui/buy.cpp:225 src/gui/buy.cpp:242
-#: src/gui/sell.cpp:76 src/gui/sell.cpp:251 src/gui/sell.cpp:264
-#, c-format
-msgid "Effect: %s"
-msgstr "效果：%s"
-
-#: src/gui/buysell.cpp:34
-msgid "Shop"
-msgstr "商店"
-
-#: src/gui/buysell.cpp:39 src/gui/sell.cpp:46 src/gui/sell.cpp:72
-msgid "Sell"
-msgstr "出售"
-
-#: src/gui/buysell.cpp:39 src/gui/changeemaildialog.cpp:52
-#: src/gui/changepassworddialog.cpp:55 src/gui/charcreatedialog.cpp:75
-#: src/gui/char_select.cpp:112 src/gui/connection.cpp:38
-#: src/gui/item_amount.cpp:67 src/gui/login.cpp:74
-#: src/gui/npcintegerdialog.cpp:49 src/gui/npclistdialog.cpp:58
-#: src/gui/npcpostdialog.cpp:54 src/gui/npcstringdialog.cpp:47
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:58
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:52 src/gui/updatewindow.cpp:112
-msgid "Cancel"
-msgstr "取消"
-
-#: src/gui/changepassworddialog.cpp:49 src/gui/login.cpp:51
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:49
-msgid "Password:"
-msgstr "密码："
-
-#: src/gui/charcreatedialog.cpp:55
-msgid "Create Character"
-msgstr "创建角色"
-
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:50
-#: src/gui/register.cpp:60
-msgid "Name:"
-msgstr "姓名"
-
-#: src/gui/charcreatedialog.cpp:70
-msgid "Hair Color:"
-msgstr "发色："
-
-#: src/gui/charcreatedialog.cpp:73
-msgid "Hair Style:"
-msgstr "发型："
-
-#: src/gui/charcreatedialog.cpp:74
-msgid "Create"
-msgstr "建立"
-
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
-msgid "Male"
-msgstr "帅哥"
-
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
-msgid "Female"
-msgstr "美女"
-
-#: src/gui/charcreatedialog.cpp:95 src/gui/charcreatedialog.cpp:235
-#, c-format
-msgid "Please distribute %d points"
-msgstr "请分发%d点数"
-
-#: src/gui/charcreatedialog.cpp:173 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:162 src/main.cpp:1487
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "错误"
-
-#: src/gui/charcreatedialog.cpp:174
-msgid "Your name needs to be at least 4 characters."
-msgstr "你的名字需要至少4个字符"
-
-#: src/gui/charcreatedialog.cpp:227
-msgid "Character stats OK"
-msgstr "角色状态可以"
-
-#: src/gui/charcreatedialog.cpp:239
-#, c-format
-msgid "Please remove %d points"
-msgstr "请删除%d点数"
-
-#: src/gui/char_select.cpp:79
-msgid "Confirm Character Delete"
-msgstr "确认删除角色"
-
-#: src/gui/char_select.cpp:80
-msgid "Are you sure you want to delete this character?"
-msgstr "你确定想删除这个角色？"
-
-#: src/gui/char_select.cpp:105
-msgid "Select Character"
-msgstr "选择角色"
-
-#: src/gui/char_select.cpp:111 src/gui/item_amount.cpp:66
-#: src/gui/ok_dialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:102
-msgid "Ok"
-msgstr "确认"
-
-#: src/gui/char_select.cpp:113
-msgid "Previous"
-msgstr "上一个"
-
-#: src/gui/char_select.cpp:114 src/gui/npc_text.cpp:88
-msgid "Next"
-msgstr "下一个"
-
-#: src/gui/char_select.cpp:115 src/gui/char_select.cpp:125
-#: src/gui/char_select.cpp:302 src/gui/char_select.cpp:323
-#: src/gui/unregisterdialog.cpp:48
-#, c-format
-msgid "Name: %s"
-msgstr "姓名：%s"
-
-#: src/gui/char_select.cpp:116 src/gui/char_select.cpp:126
-#: src/gui/char_select.cpp:304 src/gui/char_select.cpp:324
-#: src/gui/status.cpp:56 src/gui/status.cpp:175
-#, c-format
-msgid "Level: %d"
-msgstr "等级：%d"
-
-#: src/gui/char_select.cpp:118 src/gui/char_select.cpp:165
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:333
-msgid "New"
-msgstr "新建"
-
-#: src/gui/char_select.cpp:119 src/gui/char_select.cpp:166
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:316
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
-msgstr "删除"
-
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
-msgid "Unregister"
-msgstr "注销"
-
-#: src/gui/char_select.cpp:127
-#, c-format
-msgid "Money: %d"
-msgstr "金钱：%d"
-
-#: src/gui/char_select.cpp:162 src/gui/char_select.cpp:306
-#: src/gui/char_select.cpp:326
-#, c-format
-msgid "Job Level: %d"
-msgstr "职业等级：%d"
-
-#: src/gui/chat.cpp:451
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "对%s窃窃私语：%s"
-
-#: src/gui/confirm_dialog.cpp:42
-msgid "Yes"
-msgstr "是"
-
-#: src/gui/confirm_dialog.cpp:43
-msgid "No"
-msgstr "否"
-
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "连接中..."
-
-#: src/gui/emotewindow.cpp:47 src/gui/inventorywindow.cpp:67
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:280
-#: src/gui/skill.cpp:147
-msgid "Use"
-msgstr "使用"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
-msgid "Equipment"
-msgstr "装备"
-
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:274
-msgid "Unequip"
-msgstr "卸下装备"
-
-#: src/gui/help.cpp:34
-msgid "Help"
-msgstr "帮助"
-
-#: src/gui/help.cpp:47 src/gui/npc_text.cpp:95
-msgid "Close"
-msgstr "关闭"
-
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
-msgid "Inventory"
-msgstr "物品栏"
-
-#: src/gui/inventorywindow.cpp:66 src/gui/inventorywindow.cpp:68
-#: src/gui/inventorywindow.cpp:277
-msgid "Equip"
-msgstr "装备"
-
-#: src/gui/inventorywindow.cpp:77
-msgid "Drop"
-msgstr "丢弃"
-
-#: src/gui/inventorywindow.cpp:79
-msgid "Split"
-msgstr "分离"
-
-#: src/gui/item_amount.cpp:92
-msgid "Select amount of items to trade."
-msgstr "请选择交易的物品数量"
-
-#: src/gui/item_amount.cpp:95
-msgid "Select amount of items to drop."
-msgstr "请选择丢弃的物品数量"
-
-#: src/gui/item_amount.cpp:104
-msgid "Select amount of items to split."
-msgstr "请选择你分离的物品的数量"
-
-#: src/gui/login.cpp:47
-msgid "Login"
-msgstr "登录"
-
-#: src/gui/login.cpp:53 src/gui/register.cpp:64 src/gui/serverdialog.cpp:75
-#: src/gui/widgets/chattab.cpp:136
-msgid "Server:"
-msgstr "服务器："
-
-#: src/gui/login.cpp:54 src/gui/register.cpp:65 src/gui/serverdialog.cpp:76
-msgid "Port:"
-msgstr "端口："
-
-#: src/gui/login.cpp:72
-msgid "Remember Username"
-msgstr "保存用户名"
-
-#: src/gui/login.cpp:73 src/gui/npcintegerdialog.cpp:48
-#: src/gui/npclistdialog.cpp:57 src/gui/npcstringdialog.cpp:46
-#: src/gui/serverselectdialog.cpp:57 src/gui/textdialog.cpp:36
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:72
-msgid "OK"
-msgstr "确定"
-
-#: src/gui/login.cpp:75 src/gui/register.cpp:56 src/gui/register.cpp:80
-msgid "Register"
-msgstr "注册"
-
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "状态"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "技能"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "快捷键"
-
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "设置"
-
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "小地图"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
-#: src/gui/popupmenu.cpp:85
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@交易|与%s交易@@"
-
-#: src/gui/popupmenu.cpp:86 src/gui/popupmenu.cpp:128
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@攻击|攻击%s@@"
-
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:354
-msgid "@@cancel|Cancel@@"
-msgstr "@@取消|取消@@"
-
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
-msgstr "@@捡起|捡起%s@@"
-
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@使用|装备@@"
-
-#: src/gui/popupmenu.cpp:339
-msgid "@@use|Unequip@@"
-msgstr "@@使用|卸载@@"
-
-#: src/gui/popupmenu.cpp:345
-msgid "@@use|Use@@"
-msgstr "@@使用|使用@@"
-
-#: src/gui/popupmenu.cpp:347
-msgid "@@drop|Drop@@"
-msgstr "@@丢弃|丢弃@@"
-
-#: src/gui/popupmenu.cpp:350
-msgid "@@split|Split@@"
-msgstr "@@分离|分离@@"
-
-#: src/gui/quitdialog.cpp:37
-msgid "Switch server"
-msgstr "交换服务器"
-
-#: src/gui/quitdialog.cpp:38
-msgid "Switch character"
-msgstr "交换角色"
-
-#: src/gui/register.cpp:62
-msgid "Confirm:"
-msgstr "确认："
-
-#: src/gui/register.cpp:67
-msgid "Email:"
-msgstr "电子邮件"
-
-#: src/gui/register.cpp:170
-#, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "用户名至少需要%d个字符。"
-
-#: src/gui/register.cpp:178
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "用户名不能少于%d个字符"
-
-#: src/gui/register.cpp:186
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "密码需要至少%d个字符"
-
-#: src/gui/register.cpp:194
-#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "密码不能少于%d个字符。"
-
-#: src/gui/register.cpp:201
-msgid "Passwords do not match."
-msgstr "密码不一致."
-
-#: src/gui/serverdialog.cpp:163
-msgid "Please type both the address and the port of a server."
-msgstr "请输入服务器的IP地址和端口"
-
-#: src/gui/serverselectdialog.cpp:50
-msgid "Select Server"
-msgstr "选择服务器"
-
-#: src/gui/setup_audio.cpp:41
-msgid "Sound"
-msgstr "声音"
-
-#: src/gui/setup_audio.cpp:45
-msgid "Audio"
-msgstr "音频"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "音效声量"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "音乐声量"
-
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "应用"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "重置窗口"
-
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "按下开始校准按钮"
-
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "校准"
-
-#: src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "启用游戏杆"
-
-#: src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "游戏杆"
-
-#: src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "停止"
-
-#: src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "旋转手柄"
-
-#: src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "键盘"
-
-#: src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "分配"
-
-#: src/gui/setup_keyboard.cpp:90
-msgid "Default"
-msgstr "预设"
-
-#: src/gui/setup_keyboard.cpp:119
-msgid "Key Conflict(s) Detected."
-msgstr "检测到按键冲突。"
-
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
-
-#: src/gui/setup_players.cpp:56
-msgid "Name"
-msgstr "姓名"
-
-#: src/gui/setup_players.cpp:57
-msgid "Relation"
-msgstr "关系"
-
-#: src/gui/setup_players.cpp:62
-msgid "Neutral"
-msgstr "中立"
-
-#: src/gui/setup_players.cpp:63
-msgid "Friend"
-msgstr "好友"
-
-#: src/gui/setup_players.cpp:65
-msgid "Ignored"
-msgstr "忽略"
-
-#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "保存玩家列表"
-
-#: src/gui/setup_players.cpp:226
-msgid "Allow trading"
-msgstr "允许交易"
-
-#: src/gui/setup_players.cpp:228
-msgid "Allow whispers"
-msgstr "允许私语"
-
-#: src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "玩家"
-
-#: src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "当忽略时："
-
-#: src/gui/setup_video.cpp:123
-msgid "Full screen"
-msgstr "全屏"
-
-#: src/gui/setup_video.cpp:124
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:125
-msgid "Custom cursor"
-msgstr "自定义鼠标"
-
-#: src/gui/setup_video.cpp:136
-msgid "FPS Limit:"
-msgstr "FPS限制："
-
-#: src/gui/setup_video.cpp:152
-msgid "Video"
-msgstr "视频"
-
-#: src/gui/setup_video.cpp:158
-msgid "Gui opacity"
-msgstr "Gui 透明度"
-
-#: src/gui/setup_video.cpp:159
-msgid "Scroll radius"
-msgstr "滑动半径"
-
-#: src/gui/setup_video.cpp:160
-msgid "Scroll laziness"
-msgstr "Scroll laziness"
-
-#: src/gui/setup_video.cpp:161
-msgid "Ambient FX"
-msgstr "环境音效"
-
-#: src/gui/setup_video.cpp:162
-msgid "Particle Detail"
-msgstr "纹理细节"
-
-#: src/gui/setup_video.cpp:247 src/gui/setup_video.cpp:538
-msgid "off"
-msgstr "关闭"
-
-#: src/gui/setup_video.cpp:250 src/gui/setup_video.cpp:261
-#: src/gui/setup_video.cpp:541 src/gui/setup_video.cpp:555
-msgid "low"
-msgstr "低"
-
-#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:267
-#: src/gui/setup_video.cpp:544 src/gui/setup_video.cpp:561
-msgid "high"
-msgstr "高"
-
-#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:558
-msgid "medium"
-msgstr "中"
-
-#: src/gui/setup_video.cpp:270 src/gui/setup_video.cpp:564
-msgid "max"
-msgstr "最大"
-
-#: src/gui/setup_video.cpp:351
-msgid "Switching to full screen"
-msgstr "切换到全屏"
-
-#: src/gui/setup_video.cpp:352
-msgid "Restart needed for changes to take effect."
-msgstr "重启生效"
-
-#: src/gui/setup_video.cpp:364
-msgid "Changing OpenGL"
-msgstr "改变成OpenGL"
-
-#: src/gui/setup_video.cpp:365
-msgid "Applying change to OpenGL requires restart."
-msgstr "运用改变为OpenGL需要重新开始"
-
-#: src/gui/skill.cpp:50
-msgid "Mystery Skill"
-msgstr "神秘技能"
-
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
-#, c-format
-msgid "Skill points: %d"
-msgstr "技能点数：%d"
-
-#: src/gui/skill.cpp:146
-msgid "Up"
-msgstr "升级"
-
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
-#, c-format
-msgid "Job: %d"
-msgstr "职业：%d"
-
-#: src/gui/status.cpp:78
-msgid "Stats"
-msgstr "状态"
-
-#: src/gui/status.cpp:79
-msgid "Total"
-msgstr "总计"
-
-#: src/gui/status.cpp:80
-msgid "Cost"
-msgstr "花费"
-
-#: src/gui/status.cpp:84
-msgid "Attack:"
-msgstr "攻击:"
-
-#: src/gui/status.cpp:85
-msgid "Defense:"
-msgstr "防御："
-
-#: src/gui/status.cpp:86
-msgid "M.Attack:"
-msgstr "魔攻："
-
-#: src/gui/status.cpp:87
-msgid "M.Defense:"
-msgstr "魔防："
-
-#: src/gui/status.cpp:89
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Ac精确度："
-
-#: src/gui/status.cpp:91
-#, no-c-format
-msgid "% Evade:"
-msgstr "% E回避率："
-
-#: src/gui/status.cpp:93
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% 伤害反射："
-
-#: src/gui/status.cpp:199
-msgid "Strength"
-msgstr "力量"
-
-#: src/gui/status.cpp:200
-msgid "Agility"
-msgstr "敏捷"
-
-#: src/gui/status.cpp:201
-msgid "Vitality"
-msgstr "生命"
-
-#: src/gui/status.cpp:202
-msgid "Intelligence"
-msgstr "智慧"
-
-#: src/gui/status.cpp:203
-msgid "Dexterity"
-msgstr "敏捷"
-
-#: src/gui/status.cpp:204
-msgid "Luck"
-msgstr "幸运"
-
-#: src/gui/status.cpp:222
-#, c-format
-msgid "Remaining Status Points: %d"
-msgstr "剩余状态点数：%d"
-
-#: src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "打算交易"
-
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
-msgid "Trade"
-msgstr "交易"
-
-#: src/gui/trade.cpp:74
-msgid "Add"
-msgstr "添加"
-
-#: src/gui/trade.cpp:97
-msgid "You give:"
-msgstr "You give:"
-
-#: src/gui/trade.cpp:101
-msgid "Change"
-msgstr "改变"
-
-#: src/gui/trade.cpp:271
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
-
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr "更新..."
-
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
-msgstr "开始"
-
-#: src/gui/updatewindow.cpp:518
-msgid "Completed"
-msgstr "已完成"
-
-#: src/gui/widgets/chattab.cpp:115
-msgid "Global announcement:"
-msgstr "全局公告："
-
-#: src/gui/widgets/chattab.cpp:121
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "%s 全局公告："
-
-#: src/main.cpp:1499
-msgid "Connecting to map server..."
-msgstr "正在连接 地图 服务器..."
-
-#: src/main.cpp:1507
-msgid "Connecting to character server..."
-msgstr "正在连接 角色 服务器..."
-
-#: src/main.cpp:1515
-msgid "Connecting to account server..."
-msgstr "正在连接 帐号 服务器..."
-
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/tmwserv/charserverhandler.cpp:253
-msgid "Strength:"
-msgstr "力量"
-
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/tmwserv/charserverhandler.cpp:254
-msgid "Agility:"
-msgstr "敏捷:"
-
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/tmwserv/charserverhandler.cpp:256
-msgid "Vitality:"
-msgstr "体力:"
-
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/tmwserv/charserverhandler.cpp:257
-msgid "Intelligence:"
-msgstr "智力:"
-
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/tmwserv/charserverhandler.cpp:255
-msgid "Dexterity:"
-msgstr "智慧:"
-
-#: src/net/ea/generalhandler.cpp:197
-msgid "Got disconnected from server!"
-msgstr "和服务器失去连接"
-
-#: src/net/ea/skillhandler.cpp:138
-msgid "Trade failed!"
-msgstr "交易失败！"
-
-#: src/net/ea/skillhandler.cpp:141
-msgid "Emote failed!"
-msgstr "发送表情失败！"
-
-#: src/net/ea/skillhandler.cpp:144
-msgid "Sit failed!"
-msgstr "原地休息失败！"
-
-#: src/net/ea/skillhandler.cpp:147
-msgid "Chat creating failed!"
-msgstr "聊天创建失败！"
-
-#: src/net/ea/skillhandler.cpp:150
-msgid "Could not join party!"
-msgstr "不能加入工会！"
-
-#: src/net/ea/skillhandler.cpp:153
-msgid "Cannot shout!"
-msgstr "无法呼喊！"
-
-#: src/net/ea/skillhandler.cpp:162
-msgid "You have not yet reached a high enough lvl!"
-msgstr "你还没有达到足够的等级！"
-
-#: src/net/ea/skillhandler.cpp:165
-msgid "Insufficient HP!"
-msgstr "HP不足！"
-
-#: src/net/ea/skillhandler.cpp:168
-msgid "Insufficient SP!"
-msgstr "SP不足！"
-
-#: src/net/ea/skillhandler.cpp:171
-msgid "You have no memos!"
-msgstr "没有备忘录"
-
-#: src/net/ea/skillhandler.cpp:180
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "此武器无法用来使用此项技能！"
-
-#: src/net/ea/skillhandler.cpp:183
-msgid "You need another red gem!"
-msgstr "你需要另一颗红宝石！"
-
-#: src/net/ea/skillhandler.cpp:186
-msgid "You need another blue gem!"
-msgstr "你需要另一颗蓝宝石！"
-
-#: src/net/ea/skillhandler.cpp:189
-msgid "You're carrying to much to do this!"
-msgstr "你已负重太多，无法办到！"
-
-#: src/net/ea/skillhandler.cpp:192
-msgid "Huh? What's that?"
-msgstr "啊？那是什么？"
-
-#: src/net/ea/skillhandler.cpp:201
-msgid "Warp failed..."
-msgstr "传送失败..."
-
-#: src/net/ea/skillhandler.cpp:204
-msgid "Could not steal anything..."
-msgstr "无法偷取任何物品..."
-
-#: src/net/ea/skillhandler.cpp:207
-msgid "Poison had no effect..."
-msgstr "毒药无效..."
-
-#: src/net/tmwserv/charserverhandler.cpp:258
-msgid "Willpower:"
-msgstr "意志力:"
-
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Attack %+d"
-msgstr "攻击 %+d"
-
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "Defense %+d"
-msgstr "防护 %+d"
-
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
-
-#: src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
-
-#: src/resources/itemdb.cpp:151
-msgid "Unnamed"
-msgstr "未知物品"
-
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
-msgid "/help > Display this help."
+#: src/commandhandler.cpp:143
+msgid "/help > Display this help"
 msgstr ""
 
 #: src/commandhandler.cpp:145
@@ -1002,6 +93,46 @@ msgstr ""
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
+#: src/commandhandler.cpp:170
+msgid "For more information, type /help <command>"
+msgstr "输入/help <指令> 获取更多帮助信息"
+
+#: src/commandhandler.cpp:174
+msgid "Command: /help"
+msgstr "指令： /help"
+
+#: src/commandhandler.cpp:175
+msgid "This command displays a list of all commands available."
+msgstr "该指令可显示所有可用指令。"
+
+#: src/commandhandler.cpp:176
+msgid "Command: /help <command>"
+msgstr "指令： /help <指令>"
+
+#: src/commandhandler.cpp:177
+msgid "This command displays help on <command>."
+msgstr "该指令显现<指令>的帮助信息"
+
+#: src/commandhandler.cpp:185
+msgid "Command: /announce <msg>"
+msgstr "指令： /announce <信息>"
+
+#: src/commandhandler.cpp:186
+msgid "*** only available to a GM ***"
+msgstr "*** 只有GM可用 ***"
+
+#: src/commandhandler.cpp:187
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "该指令会发送<信息>给所有在线用户。"
+
+#: src/commandhandler.cpp:192
+msgid "Command: /clear"
+msgstr "指令： /clear"
+
+#: src/commandhandler.cpp:193
+msgid "This command clears the chat log of previous chat."
+msgstr "该指令可清除历史聊天记录。"
+
 #: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr ""
@@ -1046,6 +177,12 @@ msgstr ""
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
+#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
+#: src/net/ea/gui/partytab.cpp:79
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
+
 #: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr ""
@@ -1062,7 +199,7 @@ msgstr ""
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:76
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
@@ -1104,8 +241,8 @@ msgstr ""
 
 #: src/commandhandler.cpp:254
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
 #: src/commandhandler.cpp:257
@@ -1116,72 +253,101 @@ msgstr ""
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: src/commandhandler.cpp:262
+msgid "Command: /where"
+msgstr "指令: /where"
+
+#: src/commandhandler.cpp:263
+msgid "This command displays the name of the current map."
+msgstr "该条指令显示当前地图名。"
+
+#: src/commandhandler.cpp:267
+msgid "Command: /who"
+msgstr "指令： /who"
+
+#: src/commandhandler.cpp:268
+msgid "This command displays the number of players currently online."
+msgstr "该条指令可显现当前在线用户总数。"
+
+#: src/commandhandler.cpp:273
+msgid "Unknown command."
+msgstr "未知命令"
+
+#: src/commandhandler.cpp:274
+msgid "Type /help for a list of commands."
+msgstr "输入 /help 获取指令列表。"
+
+#: src/commandhandler.cpp:340
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
-"Cannont create a whisper tab for nick '%s'!It either already exists, or is "
+"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:398
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
 #: src/commandhandler.h:31
 #, c-format
-msgid ""
-"Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:248
+#: src/game.cpp:236
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:411
+#: src/game.cpp:400
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:416
+#: src/game.cpp:405
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:665
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
+#: src/keyboardconfig.cpp:101
+msgid "Quit"
+msgstr "退出"
+
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:672
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:813
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:820
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -1193,8 +359,12 @@ msgstr ""
 msgid "Buddy List"
 msgstr ""
 
+#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+msgid "Buy"
+msgstr "购买"
+
 #: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:277
+#: src/gui/sell.cpp:278
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -1203,45 +373,206 @@ msgstr ""
 msgid "Max"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:42 src/gui/changeemaildialog.cpp:51
-#: src/gui/char_select.cpp:122
+#: src/gui/buy.cpp:73 src/gui/buy.cpp:223 src/gui/buy.cpp:241
+#: src/gui/sell.cpp:75 src/gui/sell.cpp:250 src/gui/sell.cpp:264
+#, c-format
+msgid "Description: %s"
+msgstr "描述：%s"
+
+#: src/gui/buy.cpp:74 src/gui/buy.cpp:225 src/gui/buy.cpp:242
+#: src/gui/sell.cpp:76 src/gui/sell.cpp:252 src/gui/sell.cpp:265
+#, c-format
+msgid "Effect: %s"
+msgstr "效果：%s"
+
+#: src/gui/buysell.cpp:34
+msgid "Shop"
+msgstr "商店"
+
+#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+msgid "Sell"
+msgstr "出售"
+
+#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
+#: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
+#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
+#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
+#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+msgid "Cancel"
+msgstr "取消"
+
+#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
+#: src/gui/charselectdialog.cpp:121
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:46 src/gui/changepassworddialog.cpp:47
-#: src/gui/char_select.cpp:124
+#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
+#: src/gui/charselectdialog.cpp:123
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
 msgid "Type New Email Address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:43 src/gui/changepassworddialog.cpp:54
-#: src/gui/char_select.cpp:121
+#: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
+#: src/gui/charselectdialog.cpp:120
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:51
+#: src/gui/changepassworddialog.cpp:50 src/gui/login.cpp:52
+#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+msgid "Password:"
+msgstr "密码："
+
+#: src/gui/changepassworddialog.cpp:52
 msgid "Type New Password twice:"
 msgstr ""
 
-#: src/gui/char_select.cpp:98
+#: src/gui/charcreatedialog.cpp:54
+msgid "Create Character"
+msgstr "创建角色"
+
+#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
+#: src/gui/register.cpp:60
+msgid "Name:"
+msgstr "姓名"
+
+#: src/gui/charcreatedialog.cpp:69
+msgid "Hair Color:"
+msgstr "发色："
+
+#: src/gui/charcreatedialog.cpp:72
+msgid "Hair Style:"
+msgstr "发型："
+
+#: src/gui/charcreatedialog.cpp:73
+msgid "Create"
+msgstr "建立"
+
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+msgid "Male"
+msgstr "帅哥"
+
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+msgid "Female"
+msgstr "美女"
+
+#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#, c-format
+msgid "Please distribute %d points"
+msgstr "请分发%d点数"
+
+#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1503
+#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
+msgid "Error"
+msgstr "错误"
+
+#: src/gui/charcreatedialog.cpp:173
+msgid "Your name needs to be at least 4 characters."
+msgstr "你的名字需要至少4个字符"
+
+#: src/gui/charcreatedialog.cpp:226
+msgid "Character stats OK"
+msgstr "角色状态可以"
+
+#: src/gui/charcreatedialog.cpp:238
+#, c-format
+msgid "Please remove %d points"
+msgstr "请删除%d点数"
+
+#: src/gui/charselectdialog.cpp:78
+msgid "Confirm Character Delete"
+msgstr "确认删除角色"
+
+#: src/gui/charselectdialog.cpp:79
+msgid "Are you sure you want to delete this character?"
+msgstr "你确定想删除这个角色？"
+
+#: src/gui/charselectdialog.cpp:97
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/char_select.cpp:163 src/gui/char_select.cpp:309
-#: src/gui/char_select.cpp:328 src/gui/status.cpp:58 src/gui/status.cpp:183
+#: src/gui/charselectdialog.cpp:104
+msgid "Select Character"
+msgstr "选择角色"
+
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
+#: src/gui/serverdialog.cpp:103
+msgid "Ok"
+msgstr "确认"
+
+#: src/gui/charselectdialog.cpp:112
+msgid "Previous"
+msgstr "上一个"
+
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
+msgid "Next"
+msgstr "下一个"
+
+#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
+#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/unregisterdialog.cpp:49
+#, c-format
+msgid "Name: %s"
+msgstr "姓名：%s"
+
+#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
+#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/status.cpp:55 src/gui/status.cpp:174
+#, c-format
+msgid "Level: %d"
+msgstr "等级：%d"
+
+#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
+msgid "New"
+msgstr "新建"
+
+#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/setup_players.cpp:228
+msgid "Delete"
+msgstr "删除"
+
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
+msgid "Unregister"
+msgstr "注销"
+
+#: src/gui/charselectdialog.cpp:126
+#, c-format
+msgid "Money: %d"
+msgstr "金钱：%d"
+
+#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
+#: src/gui/charselectdialog.cpp:325
+#, c-format
+msgid "Job Level: %d"
+msgstr "职业等级：%d"
+
+#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
+#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/chat.cpp:72 src/gui/menuwindow.cpp:65 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:324
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
@@ -1249,13 +580,35 @@ msgstr ""
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/chat.cpp:467
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "对%s窃窃私语：%s"
+
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "是"
+
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "否"
+
+#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
+msgid "Connecting..."
+msgstr "连接中..."
+
+#: src/gui/emotepopup.cpp:64
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/emotewindow.cpp:37 src/gui/menuwindow.cpp:76
-msgid "Emote"
-msgstr ""
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
+msgid "Equipment"
+msgstr "装备"
+
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
+msgid "Unequip"
+msgstr "卸下装备"
 
 #: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
 msgid "Guild"
@@ -1273,36 +626,104 @@ msgstr ""
 msgid "Quit Guild"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/help.cpp:34
+msgid "Help"
+msgstr "帮助"
+
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+msgid "Close"
+msgstr "关闭"
+
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+msgid "Inventory"
+msgstr "物品栏"
+
+#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:270
+msgid "Equip"
+msgstr "装备"
+
+#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+msgid "Use"
+msgstr "使用"
+
+#: src/gui/inventorywindow.cpp:80
+msgid "Drop"
+msgstr "丢弃"
+
+#: src/gui/inventorywindow.cpp:81
+msgid "Split"
+msgstr "分离"
+
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/item_amount.cpp:68
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:123
+msgid "Select amount of items to trade."
+msgstr "请选择交易的物品数量"
+
+#: src/gui/itemamount.cpp:126
+msgid "Select amount of items to drop."
+msgstr "请选择丢弃的物品数量"
+
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itempopup.cpp:89
+#: src/gui/itemamount.cpp:135
+msgid "Select amount of items to split."
+msgstr "请选择你分离的物品的数量"
+
+#: src/gui/itempopup.cpp:91
 msgid "Weight: "
 msgstr ""
 
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:48
+msgid "Login"
+msgstr "登录"
+
+#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
+#: src/gui/widgets/chattab.cpp:135
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
+msgid "Port:"
+msgstr "端口："
+
+#: src/gui/login.cpp:56
 msgid "Recent:"
 msgstr ""
 
-#: src/gui/magic.cpp:32 src/gui/menuwindow.cpp:71 src/gui/skilldialog.cpp:117
-#: src/localplayer.cpp:860
+#: src/gui/login.cpp:73
+msgid "Remember Username"
+msgstr "保存用户名"
+
+#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
+msgid "OK"
+msgstr "确定"
+
+#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+msgid "Register"
+msgstr "注册"
+
+#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -1318,43 +739,33 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr ""
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#, fuzzy
+msgid "Map"
+msgstr "小地图"
 
-#: src/gui/menuwindow.cpp:73
-msgid "Buddys"
+#: src/gui/npcdialog.cpp:42
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
-msgstr ""
+#: src/gui/npcdialog.cpp:45
+#, fuzzy
+msgid "Submit"
+msgstr "退出"
 
-#: src/gui/npcintegerdialog.cpp:50
-msgid "Reset"
-msgstr ""
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
 
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-msgid ""
-"\n"
-"> Cancel\n"
+#: src/gui/npcdialog.cpp:104
+msgid "Reset"
 msgstr ""
 
 #: src/gui/npcpostdialog.cpp:51
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: src/gui/npc_text.cpp:53 src/gui/npc_text.cpp:119
-msgid "Waiting for server"
-msgstr ""
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:233
-#: src/gui/setup_video.cpp:495
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
 
@@ -1406,8 +817,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:38
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -1428,7 +839,7 @@ msgid "Being"
 msgstr ""
 
 #: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
 msgstr ""
 
 #: src/gui/palette.cpp:105
@@ -1452,19 +863,21 @@ msgid "Unknown Item Type"
 msgstr ""
 
 #: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
 msgstr ""
 
 #: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "状态"
 
 #: src/gui/palette.cpp:113
-msgid "Usable"
-msgstr ""
+#, fuzzy
+msgid "Usables"
+msgstr "使用"
 
 #: src/gui/palette.cpp:114
-msgid "Shirt"
+msgid "Shirts"
 msgstr ""
 
 #: src/gui/palette.cpp:115
@@ -1484,15 +897,16 @@ msgid "2 Handed Weapons"
 msgstr ""
 
 #: src/gui/palette.cpp:119
-msgid "Shield"
-msgstr ""
+#, fuzzy
+msgid "Shields"
+msgstr "技能"
 
 #: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
 msgstr ""
 
 #: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
 msgstr ""
 
 #: src/gui/palette.cpp:122
@@ -1547,54 +961,124 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:73
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:89
+#, c-format
+msgid "@@trade|Trade With %s@@"
+msgstr "@@交易|与%s交易@@"
+
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#, c-format
+msgid "@@attack|Attack %s@@"
+msgstr "@@攻击|攻击%s@@"
+
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:95
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:111
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
+msgid "@@cancel|Cancel@@"
+msgstr "@@取消|取消@@"
+
+#: src/gui/popupmenu.cpp:165
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
+msgstr "@@捡起|捡起%s@@"
+
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
+msgid "@@chat|Add to chat@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:356
+msgid "@@use|Unequip@@"
+msgstr "@@使用|卸载@@"
+
+#: src/gui/popupmenu.cpp:358
+msgid "@@use|Equip@@"
+msgstr "@@使用|装备@@"
+
+#: src/gui/popupmenu.cpp:361
+msgid "@@use|Use@@"
+msgstr "@@使用|使用@@"
+
+#: src/gui/popupmenu.cpp:363
+msgid "@@drop|Drop@@"
+msgstr "@@丢弃|丢弃@@"
+
+#: src/gui/popupmenu.cpp:367
+msgid "@@split|Split@@"
+msgstr "@@分离|分离@@"
+
+#: src/gui/popupmenu.cpp:372
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@使用|使用@@"
+
+#: src/gui/popupmenu.cpp:379
+msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
+#: src/gui/quitdialog.cpp:37
+msgid "Switch server"
+msgstr "交换服务器"
+
+#: src/gui/quitdialog.cpp:38
+msgid "Switch character"
+msgstr "交换角色"
+
 #: src/gui/recorder.cpp:87
 msgid "Finishing recording."
 msgstr ""
@@ -1623,15 +1107,83 @@ msgstr ""
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:73
+#: src/gui/register.cpp:62
+msgid "Confirm:"
+msgstr "确认："
+
+#: src/gui/register.cpp:67
+msgid "Email:"
+msgstr "电子邮件"
+
+#: src/gui/register.cpp:170
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "用户名至少需要%d个字符。"
+
+#: src/gui/register.cpp:178
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "用户名不能少于%d个字符"
+
+#: src/gui/register.cpp:186
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "密码需要至少%d个字符"
+
+#: src/gui/register.cpp:194
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "密码不能少于%d个字符。"
+
+#: src/gui/register.cpp:201
+msgid "Passwords do not match."
+msgstr "密码不一致."
+
+#: src/gui/serverdialog.cpp:74
 msgid "Choose your server"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/serverdialog.cpp:164
+msgid "Please type both the address and the port of a server."
+msgstr "请输入服务器的IP地址和端口"
+
+#: src/gui/serverselectdialog.cpp:59
+msgid "Select Server"
+msgstr "选择服务器"
+
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "设置"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "应用"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "重置窗口"
+
+#: src/gui/setup_audio.cpp:41
+msgid "Sound"
+msgstr "声音"
+
+#: src/gui/setup_audio.cpp:45
+msgid "Audio"
+msgstr "音频"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "音效声量"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "音乐声量"
+
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr ""
 
@@ -1639,22 +1191,22 @@ msgstr ""
 msgid "Type: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
 msgid "Static"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
 msgid "Pulse"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
 msgid "Rainbow"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
 msgid "Spectrum"
 msgstr ""
 
@@ -1662,113 +1214,292 @@ msgstr ""
 msgid "Delay: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:109
+#: src/gui/setup_colors.cpp:108
 msgid "Red: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:125
+#: src/gui/setup_colors.cpp:123
 msgid "Green: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:138
 msgid "Blue: "
 msgstr ""
 
+#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "按下开始校准按钮"
+
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "校准"
+
+#: src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "启用游戏杆"
+
+#: src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "游戏杆"
+
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "停止"
+
+#: src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "旋转手柄"
+
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "键盘"
+
+#: src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "分配"
+
+#: src/gui/setup_keyboard.cpp:90
+msgid "Default"
+msgstr "预设"
+
+#: src/gui/setup_keyboard.cpp:119
+msgid "Key Conflict(s) Detected."
+msgstr "检测到按键冲突。"
+
+#: src/gui/setup_keyboard.cpp:120
+msgid "Resolve them, or gameplay may result in strange behaviour."
+msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
+
+#: src/gui/setup_players.cpp:56
+msgid "Name"
+msgstr "姓名"
+
+#: src/gui/setup_players.cpp:57
+msgid "Relation"
+msgstr "关系"
+
+#: src/gui/setup_players.cpp:62
+msgid "Neutral"
+msgstr "中立"
+
+#: src/gui/setup_players.cpp:63
+msgid "Friend"
+msgstr "好友"
+
 #: src/gui/setup_players.cpp:64
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:65
+msgid "Ignored"
+msgstr "忽略"
+
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:224
+msgid "Allow trading"
+msgstr "允许交易"
+
+#: src/gui/setup_players.cpp:226
+msgid "Allow whispers"
+msgstr "允许私语"
+
+#: src/gui/setup_players.cpp:230
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_players.cpp:232
+msgid "Players"
+msgstr "玩家"
+
+#: src/gui/setup_players.cpp:257
+msgid "When ignoring:"
+msgstr "当忽略时："
+
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+#, fuzzy
+msgid "Small"
+msgstr "出售"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "中"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "关闭"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
+msgstr "全屏"
+
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
+msgstr "自定义鼠标"
+
+#: src/gui/setup_video.cpp:191
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:193
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:128
+#: src/gui/setup_video.cpp:195
 msgid "Show name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:129
+#: src/gui/setup_video.cpp:196
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:130
+#: src/gui/setup_video.cpp:197
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:131
+#: src/gui/setup_video.cpp:198
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
+msgstr "FPS限制："
+
+#: src/gui/setup_video.cpp:214
+msgid "Video"
+msgstr "视频"
+
+#: src/gui/setup_video.cpp:219
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:230 src/gui/setup_video.cpp:492
-msgid "No text"
-msgstr ""
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
+msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
-msgid "Bubbles, no names"
-msgstr ""
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
+msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:239 src/gui/setup_video.cpp:501
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
+msgstr "纹理细节"
+
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:356
 msgid "Failed to switch to "
 msgstr ""
 
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:357
 msgid "windowed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:357
 msgid "fullscreen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:358
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:448
+#: src/gui/setup_video.cpp:367
+msgid "Switching to full screen"
+msgstr "切换到全屏"
+
+#: src/gui/setup_video.cpp:368
+msgid "Restart needed for changes to take effect."
+msgstr "重启生效"
+
+#: src/gui/setup_video.cpp:380
+msgid "Changing OpenGL"
+msgstr "改变成OpenGL"
+
+#: src/gui/setup_video.cpp:381
+msgid "Applying change to OpenGL requires restart."
+msgstr "运用改变为OpenGL需要重新开始"
+
+#: src/gui/setup_video.cpp:442
 msgid "Screen resolution changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:449
+#: src/gui/setup_video.cpp:443
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:473
+#: src/gui/setup_video.cpp:467
 msgid "Particle effect settings changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:474
+#: src/gui/setup_video.cpp:468
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
+#: src/gui/skill.cpp:53
+msgid "Mystery Skill"
+msgstr "神秘技能"
 
-#: src/gui/skill.cpp:147
-msgid "use"
-msgstr ""
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "技能"
+
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#, c-format
+msgid "Skill points: %d"
+msgstr "技能点数：%d"
+
+#: src/gui/skill.cpp:149
+msgid "Up"
+msgstr "升级"
 
 #: src/gui/skilldialog.cpp:113
 msgid "Weapons"
@@ -1778,67 +1509,176 @@ msgstr ""
 msgid "Crafts"
 msgstr ""
 
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#, c-format
+msgid "Job: %d"
+msgstr "职业：%d"
+
+#: src/gui/status.cpp:60
 msgid "HP:"
 msgstr ""
 
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
 msgid "MP:"
 msgstr ""
 
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
 msgid "Job:"
 msgstr ""
 
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:77
+msgid "Stats"
+msgstr "状态"
+
+#: src/gui/status.cpp:78
+msgid "Total"
+msgstr "总计"
+
+#: src/gui/status.cpp:79
+msgid "Cost"
+msgstr "花费"
+
+#: src/gui/status.cpp:83
+msgid "Attack:"
+msgstr "攻击:"
+
+#: src/gui/status.cpp:84
+msgid "Defense:"
+msgstr "防御："
+
+#: src/gui/status.cpp:85
+msgid "M.Attack:"
+msgstr "魔攻："
+
+#: src/gui/status.cpp:86
+msgid "M.Defense:"
+msgstr "魔防："
+
+#: src/gui/status.cpp:88
+#, no-c-format
+msgid "% Accuracy:"
+msgstr "% Ac精确度："
+
+#: src/gui/status.cpp:90
+#, no-c-format
+msgid "% Evade:"
+msgstr "% E回避率："
+
+#: src/gui/status.cpp:92
+#, no-c-format
+msgid "% Reflex:"
+msgstr "% 伤害反射："
+
+#: src/gui/status.cpp:198
+msgid "Strength"
+msgstr "力量"
+
+#: src/gui/status.cpp:199
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/gui/status.cpp:200
+msgid "Vitality"
+msgstr "生命"
+
+#: src/gui/status.cpp:201
+msgid "Intelligence"
+msgstr "智慧"
+
+#: src/gui/status.cpp:202
+msgid "Dexterity"
+msgstr "敏捷"
+
+#: src/gui/status.cpp:203
+msgid "Luck"
+msgstr "幸运"
+
+#: src/gui/status.cpp:221
+#, c-format
+msgid "Remaining Status Points: %d"
+msgstr "剩余状态点数：%d"
+
+#: src/gui/status.cpp:384
 msgid "Max level"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
 msgid "Storage"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
 msgid "Store"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
 msgid "Slots: "
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:51
+msgid "Propose trade"
+msgstr "打算交易"
+
+#: src/gui/trade.cpp:52
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:96 src/gui/trade.cpp:132 src/gui/trade.cpp:178
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+msgid "Trade"
+msgstr "交易"
+
+#: src/gui/trade.cpp:73
+msgid "Add"
+msgstr "添加"
+
+#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
 #, c-format
 msgid "You get %s."
 msgstr ""
 
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:96
+msgid "You give:"
+msgstr "You give:"
+
+#: src/gui/trade.cpp:100
+msgid "Change"
+msgstr "改变"
+
+#: src/gui/trade.cpp:268
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
+
+#: src/gui/trade.cpp:311
 msgid "You don't have enough money"
 msgstr ""
 
+#: src/gui/updatewindow.cpp:91
+msgid "Updating..."
+msgstr "更新..."
+
+#: src/gui/updatewindow.cpp:113
+msgid "Play"
+msgstr "开始"
+
 #: src/gui/updatewindow.cpp:325
 msgid "curl error "
 msgstr ""
@@ -1859,6 +1699,10 @@ msgstr ""
 msgid "##1  you try again later"
 msgstr ""
 
+#: src/gui/updatewindow.cpp:518
+msgid "Completed"
+msgstr "已完成"
+
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
@@ -1935,12 +1779,21 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:114
+msgid "Global announcement:"
+msgstr "全局公告："
+
+#: src/gui/widgets/chattab.cpp:120
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "%s 全局公告："
+
+#: src/gui/widgets/chattab.cpp:146
 #, c-format
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1948,23 +1801,34 @@ msgstr ""
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
 msgid "This command closes the current whisper tab."
 msgstr ""
 
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "状态"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+msgid "Buddys"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "快捷键"
+
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
 msgstr ""
@@ -1986,294 +1850,315 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
-msgid "Help Window"
-msgstr ""
-
 #: src/keyboardconfig.cpp:71
-msgid "Status Window"
+msgid "Help Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:72
-msgid "Inventory Window"
+msgid "Status Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:73
-msgid "Equipment WIndow"
+msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Skill Window"
+msgid "Equipment WIndow"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
-msgid "Minimap Window"
+msgid "Skill Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:76
-msgid "Chat Window"
+msgid "Minimap Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
+msgid "Chat Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:78
-msgid "Setup Window"
+msgid "Item Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:79
-msgid "Debug Window"
+msgid "Setup Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
-msgid "Emote Window"
+msgid "Debug Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Party Window"
+msgstr "重置窗口"
+
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:858
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:859
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:861
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:862
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:253
+#: src/main.cpp:255
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:286 src/main.cpp:292
+#: src/main.cpp:288 src/main.cpp:294
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:325
+#: src/main.cpp:327
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:481
+#: src/main.cpp:483
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:484
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:562
+#: src/main.cpp:566
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid "  -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid "  -d --data       : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid "  -D --default    : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:568
-msgid "  -h --help       : Display this help"
+msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
 #: src/main.cpp:569
-msgid "  -S --homedir    : Directory to use as home directory"
+msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
 #: src/main.cpp:570
-msgid "  -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid "  -P --password   : Login with this password"
+msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
 #: src/main.cpp:572
-msgid "  -c --character  : Login with this character"
+msgid "  -h --help        : Display this help"
 msgstr ""
 
 #: src/main.cpp:573
-msgid "  -o --port       : Login Server Port"
+msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
 #: src/main.cpp:574
-msgid "  -s --server     : Login Server name or IP"
+msgid "  -H --update-host : Use this update host"
 msgstr ""
 
 #: src/main.cpp:575
-msgid "  -u --skipupdate : Skip the update downloads"
+msgid "  -P --password    : Login with this password"
 msgstr ""
 
 #: src/main.cpp:576
-msgid "  -U --username   : Login with this username"
+msgid "  -c --character   : Login with this character"
 msgstr ""
 
 #: src/main.cpp:577
-msgid "  -v --version    : Display the version"
+msgid "  -p --port        : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid "  -s --server      : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid "  -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid "  -U --username    : Login with this username"
 msgstr ""
 
 #: src/main.cpp:582
+msgid "  -O --no-opengl   : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid "  -v --version     : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
 msgid "The Mana World "
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:67
+#: src/main.cpp:1515
+msgid "Connecting to map server..."
+msgstr "正在连接 地图 服务器..."
+
+#: src/main.cpp:1523
+msgid "Connecting to character server..."
+msgstr "正在连接 角色 服务器..."
+
+#: src/main.cpp:1531
+msgid "Connecting to account server..."
+msgstr "正在连接 帐号 服务器..."
+
+#: src/net/ea/adminhandler.cpp:66
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
 msgid "Kick succeeded!"
 msgstr ""
 
@@ -2325,22 +2210,47 @@ msgstr ""
 msgid "Failed to delete character."
 msgstr ""
 
+#: src/net/ea/charserverhandler.cpp:224
+#: src/net/tmwserv/charserverhandler.cpp:253
+msgid "Strength:"
+msgstr "力量"
+
+#: src/net/ea/charserverhandler.cpp:225
+#: src/net/tmwserv/charserverhandler.cpp:254
+msgid "Agility:"
+msgstr "敏捷:"
+
+#: src/net/ea/charserverhandler.cpp:226
+#: src/net/tmwserv/charserverhandler.cpp:256
+msgid "Vitality:"
+msgstr "体力:"
+
+#: src/net/ea/charserverhandler.cpp:227
+#: src/net/tmwserv/charserverhandler.cpp:257
+msgid "Intelligence:"
+msgstr "智力:"
+
+#: src/net/ea/charserverhandler.cpp:228
+#: src/net/tmwserv/charserverhandler.cpp:255
+msgid "Dexterity:"
+msgstr "智慧:"
+
 #: src/net/ea/charserverhandler.cpp:229
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
+#: src/net/ea/chathandler.cpp:78
 msgid "Whisper could not be sent, user is offline"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
+#: src/net/ea/chathandler.cpp:81
 msgid "Whisper could not be sent, ignored by user"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:203 src/net/ea/chathandler.cpp:209
-#: src/net/ea/chathandler.cpp:214 src/net/ea/chathandler.cpp:219
-#: src/net/ea/chathandler.cpp:224 src/net/ea/chathandler.cpp:229
-#: src/net/ea/chathandler.cpp:234 src/net/ea/chathandler.cpp:239
+#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
+#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
+#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
+#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2352,181 +2262,193 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:90 src/net/tmwserv/generalhandler.cpp:80
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "力量"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "生命"
 
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "智慧"
 
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:100
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "幸运"
 
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:118
 msgid "Authentication failed"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:126
+#: src/net/ea/generalhandler.cpp:121
 msgid "No servers available"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:129
+#: src/net/ea/generalhandler.cpp:125
+msgid "Someone else is trying to use this account"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:128
 msgid "This account is already logged in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:131
 msgid "Speed hack detected"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:134
 msgid "Duplicated login"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:137
 msgid "Unknown connection error"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/generalhandler.cpp:194
+msgid "Got disconnected from server!"
+msgstr "和服务器失去连接"
+
+#: src/net/ea/gui/partytab.cpp:55
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:56
 msgid "/create > Create a new party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:57
 msgid "/new > Alias of create"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:58
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:59
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:71
 msgid "Command: /new <party-name>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:72
 msgid "Command: /create <party-name>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:73
 msgid "These commands create a new party called <party-name>."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:77
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:89
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:90
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:91
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:95
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:99
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:100
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:101
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:105
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:111
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Party name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:134 src/net/ea/partyhandler.cpp:188
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:137 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:140 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:166 src/net/ea/partyhandler.cpp:165
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:169 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:172 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -2536,289 +2458,367 @@ msgstr ""
 
 #: src/net/ea/inventoryhandler.cpp:194
 #, c-format
-msgid "You picked up %s [%s]"
+msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
 #: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:111
+#: src/net/ea/loginhandler.cpp:110
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:124
+#: src/net/ea/loginhandler.cpp:123
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:127
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 " Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:135
+#: src/net/ea/loginhandler.cpp:134
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:138
+#: src/net/ea/loginhandler.cpp:137 src/net/tmwserv/loginhandler.cpp:89
+#: src/net/tmwserv/loginhandler.cpp:119 src/net/tmwserv/loginhandler.cpp:152
+#: src/net/tmwserv/loginhandler.cpp:188 src/net/tmwserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:229
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:323
+#: src/net/ea/partyhandler.cpp:299
+msgid "Inviting like this isn't supported at the moment."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114
-msgid "Insert coin to continue"
+#: src/net/ea/playerhandler.cpp:102
+msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:120
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:121
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:124
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:125
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:138
+#: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:128
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:141
+#: src/net/ea/playerhandler.cpp:129
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:142
+#: src/net/ea/playerhandler.cpp:130
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:144
+#: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:145
+#: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:258 src/net/ea/playerhandler.cpp:281
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:301
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:424
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:139
+msgid "Trade failed!"
+msgstr "交易失败！"
+
+#: src/net/ea/skillhandler.cpp:142
+msgid "Emote failed!"
+msgstr "发送表情失败！"
+
+#: src/net/ea/skillhandler.cpp:145
+msgid "Sit failed!"
+msgstr "原地休息失败！"
+
+#: src/net/ea/skillhandler.cpp:148
+msgid "Chat creating failed!"
+msgstr "聊天创建失败！"
+
+#: src/net/ea/skillhandler.cpp:151
+msgid "Could not join party!"
+msgstr "不能加入工会！"
+
+#: src/net/ea/skillhandler.cpp:154
+msgid "Cannot shout!"
+msgstr "无法呼喊！"
+
+#: src/net/ea/skillhandler.cpp:163
+msgid "You have not yet reached a high enough lvl!"
+msgstr "你还没有达到足够的等级！"
+
+#: src/net/ea/skillhandler.cpp:166
+msgid "Insufficient HP!"
+msgstr "HP不足！"
+
+#: src/net/ea/skillhandler.cpp:169
+msgid "Insufficient SP!"
+msgstr "SP不足！"
+
+#: src/net/ea/skillhandler.cpp:172
+msgid "You have no memos!"
+msgstr "没有备忘录"
+
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/skillhandler.cpp:181
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "此武器无法用来使用此项技能！"
+
+#: src/net/ea/skillhandler.cpp:184
+msgid "You need another red gem!"
+msgstr "你需要另一颗红宝石！"
+
+#: src/net/ea/skillhandler.cpp:187
+msgid "You need another blue gem!"
+msgstr "你需要另一颗蓝宝石！"
+
+#: src/net/ea/skillhandler.cpp:190
+msgid "You're carrying to much to do this!"
+msgstr "你已负重太多，无法办到！"
+
+#: src/net/ea/skillhandler.cpp:193
+msgid "Huh? What's that?"
+msgstr "啊？那是什么？"
+
+#: src/net/ea/skillhandler.cpp:202
+msgid "Warp failed..."
+msgstr "传送失败..."
+
+#: src/net/ea/skillhandler.cpp:205
+msgid "Could not steal anything..."
+msgstr "无法偷取任何物品..."
+
+#: src/net/ea/skillhandler.cpp:208
+msgid "Poison had no effect..."
+msgstr "毒药无效..."
+
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2834,19 +2834,103 @@ msgstr ""
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/tmwserv/chathandler.cpp:151
+#: src/net/tmwserv/charserverhandler.cpp:258
+msgid "Willpower:"
+msgstr "意志力:"
+
+#: src/net/tmwserv/chathandler.cpp:157
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Willpower: %d"
+#: src/net/tmwserv/generalhandler.cpp:87
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "意志力:"
+
+#: src/net/tmwserv/loginhandler.cpp:80
+msgid "Wrong magic_token"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+msgid "Already logged in"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+msgid "Server is full"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:110
+msgid "New password incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:140
+msgid "New email address incorrect"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+msgid "Client version is too old"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:179
+msgid "Wrong username or password"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
+#, c-format
+msgid "Attack %+d"
+msgstr "攻击 %+d"
+
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Defense %+d"
+msgstr "防护 %+d"
+
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
+
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
+
+#: src/resources/itemdb.cpp:112
 msgid "items.xml"
 msgstr ""
 
+#: src/resources/itemdb.cpp:150
+msgid "Unnamed"
+msgstr "未知物品"
+
 #: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
@@ -2858,3 +2942,12 @@ msgstr ""
 #: src/resources/npcdb.cpp:53
 msgid "NPC Database: Error while loading npcs.xml!"
 msgstr ""
+
+#~ msgid "Save player list"
+#~ msgstr "保存玩家列表"
+
+#~ msgid "Scroll radius"
+#~ msgstr "滑动半径"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll laziness"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index e5d59ca8..68718879 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-05-05 10:15+0000\n"
 "Last-Translator: lok0919 <lok0919@gmail.com>\n"
-"Language-Team: Traditional Chinese <themanaworld-"
-"devel@lists.sourceforge.net>\n"
+"Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
+"net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,8 +26,9 @@ msgstr ""
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
-msgid "/help > Display this help."
+#: src/commandhandler.cpp:143
+#, fuzzy
+msgid "/help > Display this help"
 msgstr "/help > 顯示幫助"
 
 #: src/commandhandler.cpp:145
@@ -180,7 +181,7 @@ msgstr ""
 
 #: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
@@ -200,7 +201,7 @@ msgstr ""
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:76
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
@@ -242,8 +243,8 @@ msgstr ""
 
 #: src/commandhandler.cpp:254
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
 #: src/commandhandler.cpp:257
@@ -278,78 +279,77 @@ msgstr "不明指令"
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
 
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: src/commandhandler.cpp:340
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
-"Cannont create a whisper tab for nick '%s'!It either already exists, or is "
+"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:398
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
 #: src/commandhandler.h:31
 #, c-format
-msgid ""
-"Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:248
+#: src/game.cpp:236
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:411
+#: src/game.cpp:400
 msgid "Screenshot saved to ~/"
 msgstr ""
 
-#: src/game.cpp:416
+#: src/game.cpp:405
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "離開"
 
-#: src/game.cpp:665
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr ""
 
-#: src/game.cpp:672
+#: src/game.cpp:661
 msgid "no"
 msgstr ""
 
-#: src/game.cpp:813
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:820
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -361,12 +361,12 @@ msgstr ""
 msgid "Buddy List"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:39
+#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
 msgid "Buy"
 msgstr "購買"
 
 #: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:277
+#: src/gui/sell.cpp:278
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -376,13 +376,13 @@ msgid "Max"
 msgstr ""
 
 #: src/gui/buy.cpp:73 src/gui/buy.cpp:223 src/gui/buy.cpp:241
-#: src/gui/sell.cpp:75 src/gui/sell.cpp:249 src/gui/sell.cpp:263
+#: src/gui/sell.cpp:75 src/gui/sell.cpp:250 src/gui/sell.cpp:264
 #, c-format
 msgid "Description: %s"
 msgstr "說明：%s"
 
 #: src/gui/buy.cpp:74 src/gui/buy.cpp:225 src/gui/buy.cpp:242
-#: src/gui/sell.cpp:76 src/gui/sell.cpp:251 src/gui/sell.cpp:264
+#: src/gui/sell.cpp:76 src/gui/sell.cpp:252 src/gui/sell.cpp:265
 #, c-format
 msgid "Effect: %s"
 msgstr "效果：%s"
@@ -391,186 +391,190 @@ msgstr "效果：%s"
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:39 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:39 src/gui/changeemaildialog.cpp:52
-#: src/gui/changepassworddialog.cpp:55 src/gui/charcreatedialog.cpp:75
-#: src/gui/char_select.cpp:112 src/gui/connection.cpp:38
-#: src/gui/item_amount.cpp:67 src/gui/login.cpp:74
-#: src/gui/npcintegerdialog.cpp:49 src/gui/npclistdialog.cpp:58
-#: src/gui/npcpostdialog.cpp:54 src/gui/npcstringdialog.cpp:47
+#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
+#: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
+#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:58
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:52 src/gui/updatewindow.cpp:112
+#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
+#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:42 src/gui/changeemaildialog.cpp:51
-#: src/gui/char_select.cpp:122
+#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
+#: src/gui/charselectdialog.cpp:121
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:46 src/gui/changepassworddialog.cpp:47
-#: src/gui/char_select.cpp:124
+#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
+#: src/gui/charselectdialog.cpp:123
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
 msgid "Type New Email Address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:43 src/gui/changepassworddialog.cpp:54
-#: src/gui/char_select.cpp:121
+#: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
+#: src/gui/charselectdialog.cpp:120
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:49 src/gui/login.cpp:51
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:49
+#: src/gui/changepassworddialog.cpp:50 src/gui/login.cpp:52
+#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gui/changepassworddialog.cpp:51
+#: src/gui/changepassworddialog.cpp:52
 msgid "Type New Password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:55
+#: src/gui/charcreatedialog.cpp:54
 msgid "Create Character"
 msgstr "新增角色"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:50
+#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
 #: src/gui/register.cpp:60
 msgid "Name:"
 msgstr "名字："
 
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
 msgid "Hair Color:"
 msgstr "灰色："
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
 msgid "Hair Style:"
 msgstr "髮型："
 
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charcreatedialog.cpp:235
+#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
-#: src/gui/charcreatedialog.cpp:173 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:162 src/main.cpp:1487
+#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1503
 #: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
 msgid "Error"
 msgstr "錯誤"
 
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
 msgid "Select Character"
 msgstr "選擇角色"
 
-#: src/gui/char_select.cpp:111 src/gui/item_amount.cpp:66
-#: src/gui/ok_dialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:102
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
+#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
+#: src/gui/serverdialog.cpp:103
 msgid "Ok"
 msgstr "確認"
 
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
 msgid "Previous"
 msgstr "上一個"
 
-#: src/gui/char_select.cpp:114 src/gui/npc_text.cpp:88
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/char_select.cpp:115 src/gui/char_select.cpp:125
-#: src/gui/char_select.cpp:302 src/gui/char_select.cpp:323
-#: src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
+#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/unregisterdialog.cpp:49
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/char_select.cpp:116 src/gui/char_select.cpp:126
-#: src/gui/char_select.cpp:304 src/gui/char_select.cpp:324
-#: src/gui/status.cpp:56 src/gui/status.cpp:175
+#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
+#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/status.cpp:55 src/gui/status.cpp:174
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/char_select.cpp:118 src/gui/char_select.cpp:165
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:333
+#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
 msgid "New"
 msgstr "新增"
 
-#: src/gui/char_select.cpp:119 src/gui/char_select.cpp:166
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:316
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
+#: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "註冊"
 
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
 #, c-format
 msgid "Money: %d"
 msgstr "金錢：%d"
 
-#: src/gui/char_select.cpp:162 src/gui/char_select.cpp:306
-#: src/gui/char_select.cpp:326
+#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
+#: src/gui/charselectdialog.cpp:325
 #, c-format
 msgid "Job Level: %d"
 msgstr "職業等級：%d"
 
-#: src/gui/char_select.cpp:163 src/gui/char_select.cpp:309
-#: src/gui/char_select.cpp:328 src/gui/status.cpp:58 src/gui/status.cpp:183
+#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
+#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/status.cpp:182
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/chat.cpp:72 src/gui/menuwindow.cpp:65 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:324
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr ""
 
@@ -578,16 +582,16 @@ msgstr ""
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:451
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
 
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
 msgid "Yes"
 msgstr "是"
 
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
 msgid "No"
 msgstr "否"
 
@@ -595,26 +599,16 @@ msgstr "否"
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: src/gui/emotewindow.cpp:37 src/gui/menuwindow.cpp:76
-msgid "Emote"
-msgstr ""
-
-#: src/gui/emotewindow.cpp:47 src/gui/inventorywindow.cpp:67
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:280
-#: src/gui/skill.cpp:147
-msgid "Use"
-msgstr "使用"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:274
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "卸下裝備"
 
@@ -638,97 +632,100 @@ msgstr ""
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:47 src/gui/npc_text.cpp:95
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
 msgid "Inventory"
 msgstr "物品攔"
 
-#: src/gui/inventorywindow.cpp:66 src/gui/inventorywindow.cpp:68
-#: src/gui/inventorywindow.cpp:277
+#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:270
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
+msgid "Use"
+msgstr "使用"
+
+#: src/gui/inventorywindow.cpp:80
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/item_amount.cpp:68
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr ""
 
-#: src/gui/item_amount.cpp:92
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
 msgid "Weight: "
 msgstr ""
 
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:64 src/gui/serverdialog.cpp:75
-#: src/gui/widgets/chattab.cpp:136
+#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
+#: src/gui/widgets/chattab.cpp:135
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:65 src/gui/serverdialog.cpp:76
+#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
 msgid "Port:"
 msgstr "Port："
 
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
 msgid "Recent:"
 msgstr ""
 
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
 msgid "Remember Username"
 msgstr "保存用戶名"
 
-#: src/gui/login.cpp:73 src/gui/npcintegerdialog.cpp:48
-#: src/gui/npclistdialog.cpp:57 src/gui/npcstringdialog.cpp:46
-#: src/gui/serverselectdialog.cpp:57 src/gui/textdialog.cpp:36
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:72
+#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/login.cpp:75 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/magic.cpp:32 src/gui/menuwindow.cpp:71 src/gui/skilldialog.cpp:117
-#: src/localplayer.cpp:860
+#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr ""
 
@@ -744,67 +741,33 @@ msgstr ""
 msgid "Cast Test Spell 3"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "狀態"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "技能"
-
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr ""
-
-#: src/gui/menuwindow.cpp:73
-msgid "Buddys"
-msgstr ""
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "快捷鍵"
-
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "設定"
-
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
+#, fuzzy
+msgid "Map"
 msgstr "小地圖"
 
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
-msgstr ""
-
-#: src/gui/npcintegerdialog.cpp:50
-msgid "Reset"
+#: src/gui/npcdialog.cpp:42
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr ""
+#: src/gui/npcdialog.cpp:45
+#, fuzzy
+msgid "Submit"
+msgstr "離開"
 
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcpostdialog.cpp:51
-msgid "Send"
-msgstr ""
-
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
+#: src/gui/npcdialog.cpp:104
+msgid "Reset"
 msgstr ""
 
-#: src/gui/npc_text.cpp:53 src/gui/npc_text.cpp:119
-msgid "Waiting for server"
+#: src/gui/npcpostdialog.cpp:51
+msgid "Send"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:233
-#: src/gui/setup_video.cpp:495
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
 
@@ -856,8 +819,8 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:38
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
@@ -878,7 +841,7 @@ msgid "Being"
 msgstr ""
 
 #: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
 msgstr ""
 
 #: src/gui/palette.cpp:105
@@ -902,19 +865,21 @@ msgid "Unknown Item Type"
 msgstr ""
 
 #: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
 msgstr ""
 
 #: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "狀態"
 
 #: src/gui/palette.cpp:113
-msgid "Usable"
-msgstr ""
+#, fuzzy
+msgid "Usables"
+msgstr "使用"
 
 #: src/gui/palette.cpp:114
-msgid "Shirt"
+msgid "Shirts"
 msgstr ""
 
 #: src/gui/palette.cpp:115
@@ -934,15 +899,16 @@ msgid "2 Handed Weapons"
 msgstr ""
 
 #: src/gui/palette.cpp:119
-msgid "Shield"
-msgstr ""
+#, fuzzy
+msgid "Shields"
+msgstr "技能"
 
 #: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
 msgstr ""
 
 #: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
 msgstr ""
 
 #: src/gui/palette.cpp:122
@@ -997,94 +963,116 @@ msgstr ""
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:73
+#: src/gui/partywindow.cpp:70
+#, c-format
+msgid "Party (%s)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@交易|與%s交易@@"
 
-#: src/gui/popupmenu.cpp:86 src/gui/popupmenu.cpp:128
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@攻擊|攻擊%s@@"
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:95
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:111
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:165
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
 msgstr "@@撿起|撿起%s@@"
 
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
+msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@使用|裝備@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@使用|卸下@@"
 
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:358
+msgid "@@use|Equip@@"
+msgstr "@@使用|裝備@@"
+
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@丟棄|丟棄@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@分離|分離@@"
 
+#: src/gui/popupmenu.cpp:372
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@使用|使用@@"
+
+#: src/gui/popupmenu.cpp:379
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
 #: src/gui/quitdialog.cpp:37
 msgid "Switch server"
 msgstr "交換伺服器"
@@ -1153,18 +1141,30 @@ msgstr "密碼不能少於%d個字元。"
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
 msgid "Choose your server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺服氣得IP地址和Port"
 
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
 msgid "Select Server"
 msgstr "選擇伺服器"
 
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "設定"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "確定"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "重置視窗"
+
 #: src/gui/setup_audio.cpp:41
 msgid "Sound"
 msgstr "聲音"
@@ -1181,11 +1181,11 @@ msgstr "音效音量"
 msgid "Music volume"
 msgstr "音樂音量"
 
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "Colors"
 msgstr ""
 
@@ -1193,22 +1193,22 @@ msgstr ""
 msgid "Type: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
 msgid "Static"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
 msgid "Pulse"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
 msgid "Rainbow"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
 msgid "Spectrum"
 msgstr ""
 
@@ -1216,26 +1216,18 @@ msgstr ""
 msgid "Delay: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:109
+#: src/gui/setup_colors.cpp:108
 msgid "Red: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:125
+#: src/gui/setup_colors.cpp:123
 msgid "Green: "
 msgstr ""
 
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:138
 msgid "Blue: "
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "確定"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "重置視窗"
-
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
@@ -1304,209 +1296,213 @@ msgstr ""
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
 msgid "???"
 msgstr ""
 
 #: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "保存玩家列表"
-
-#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+#, fuzzy
+msgid "Small"
+msgstr "出售"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "中"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "關閉"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_video.cpp:187
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:124
+#: src/gui/setup_video.cpp:188
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:125
+#: src/gui/setup_video.cpp:189
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:191
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:193
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:128
+#: src/gui/setup_video.cpp:195
 msgid "Show name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:129
+#: src/gui/setup_video.cpp:196
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:130
+#: src/gui/setup_video.cpp:197
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:131
+#: src/gui/setup_video.cpp:198
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:203
 msgid "FPS Limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:214
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:219
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158
+#: src/gui/setup_video.cpp:220
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:159
-msgid "Scroll radius"
-msgstr "捲動半徑"
-
-#: src/gui/setup_video.cpp:160
-msgid "Scroll laziness"
-msgstr "捲動延遲"
-
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:221
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:222
 msgid "Particle Detail"
 msgstr "紋理細節"
 
-#: src/gui/setup_video.cpp:230 src/gui/setup_video.cpp:492
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:239 src/gui/setup_video.cpp:501
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:247 src/gui/setup_video.cpp:538
-msgid "off"
-msgstr "關閉"
-
-#: src/gui/setup_video.cpp:250 src/gui/setup_video.cpp:261
-#: src/gui/setup_video.cpp:541 src/gui/setup_video.cpp:555
-msgid "low"
-msgstr "低"
-
-#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:267
-#: src/gui/setup_video.cpp:544 src/gui/setup_video.cpp:561
-msgid "high"
-msgstr "高"
-
-#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:558
-msgid "medium"
-msgstr "中"
-
-#: src/gui/setup_video.cpp:270 src/gui/setup_video.cpp:564
-msgid "max"
-msgstr "最大"
-
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:356
 msgid "Failed to switch to "
 msgstr ""
 
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:357
 msgid "windowed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:357
 msgid "fullscreen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:358
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:351
+#: src/gui/setup_video.cpp:367
 msgid "Switching to full screen"
 msgstr "切換全螢幕"
 
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:368
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:380
 msgid "Changing OpenGL"
 msgstr "切換為OpenGL"
 
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:381
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:448
+#: src/gui/setup_video.cpp:442
 msgid "Screen resolution changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:449
+#: src/gui/setup_video.cpp:443
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:473
+#: src/gui/setup_video.cpp:467
 msgid "Particle effect settings changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:474
+#: src/gui/setup_video.cpp:468
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr ""
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "神秘技能"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "技能"
+
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-msgid "use"
-msgstr ""
-
 #: src/gui/skilldialog.cpp:113
 msgid "Weapons"
 msgstr ""
@@ -1515,166 +1511,165 @@ msgstr ""
 msgid "Crafts"
 msgstr ""
 
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
 msgid "HP:"
 msgstr ""
 
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
 msgid "MP:"
 msgstr ""
 
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
 msgid "Job:"
 msgstr ""
 
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
 msgid "Stats"
 msgstr "狀態"
 
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
 msgid "Total"
 msgstr "總共"
 
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
 msgid "Cost"
 msgstr "需求"
 
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
 msgid "Attack:"
 msgstr "攻擊:"
 
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
 msgid "Defense:"
 msgstr "防禦："
 
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
 msgid "M.Attack:"
 msgstr "摩攻："
 
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
 msgid "M.Defense:"
 msgstr "魔防："
 
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
 #, no-c-format
 msgid "% Accuracy:"
 msgstr "% Ac準確度："
 
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
 #, no-c-format
 msgid "% Evade:"
 msgstr "% E迴避率："
 
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
 #, no-c-format
 msgid "% Reflex:"
 msgstr "% 傷害反射："
 
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
 msgid "Strength"
 msgstr "力量"
 
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
 msgid "Agility"
 msgstr "敏捷"
 
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
 msgid "Vitality"
 msgstr "體力"
 
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
 msgid "Intelligence"
 msgstr "智力"
 
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
 msgid "Dexterity"
 msgstr "閃躲"
 
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
 msgid "Luck"
 msgstr "幸運"
 
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "剩餘狀態點數：%d"
 
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
 msgid "Max level"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
 msgid "Storage"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
 msgid "Store"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
 msgid "Slots: "
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
 msgid "Propose trade"
 msgstr "是否交易"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/trade.cpp:96 src/gui/trade.cpp:132 src/gui/trade.cpp:178
+#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
 #, c-format
 msgid "You get %s."
 msgstr ""
 
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:271
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/trade.cpp:268
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:311
 msgid "You don't have enough money"
 msgstr ""
 
@@ -1786,21 +1781,21 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
 msgid "Global announcement:"
 msgstr "主要公告："
 
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
 #, c-format
 msgid "%s whispers: "
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr ""
 
@@ -1808,23 +1803,34 @@ msgstr ""
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
 msgid "This command closes the current whisper tab."
 msgstr ""
 
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "狀態"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+msgid "Buddys"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "快捷鍵"
+
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
 msgstr ""
@@ -1846,306 +1852,316 @@ msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
-msgid "Smilie"
+msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
-msgid "Talk"
+msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+msgid "Target Closest"
 msgstr ""
 
 #: src/keyboardconfig.cpp:51
-msgid "Target Player"
+msgid "Target NPC"
 msgstr ""
 
 #: src/keyboardconfig.cpp:52
-msgid "Pickup"
+msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
+msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
-msgid "Sit"
+msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
+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:58 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: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:70
-msgid "Help Window"
-msgstr ""
-
 #: src/keyboardconfig.cpp:71
-msgid "Status Window"
+msgid "Help Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:72
-msgid "Inventory Window"
+msgid "Status Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:73
-msgid "Equipment WIndow"
+msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
-msgid "Skill Window"
+msgid "Equipment WIndow"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
-msgid "Minimap Window"
+msgid "Skill Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:76
-msgid "Chat Window"
+msgid "Minimap Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
+msgid "Chat Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:78
-msgid "Setup Window"
+msgid "Item Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:79
-msgid "Debug Window"
+msgid "Setup Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
-msgid "Emote Window"
+msgid "Debug Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Party Window"
+msgstr "重置視窗"
+
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 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: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:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr ""
 
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr ""
 
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr ""
 
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr ""
 
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr ""
 
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr ""
 
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr ""
 
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr ""
 
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr ""
 
-#: src/localplayer.cpp:858
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr ""
 
-#: src/localplayer.cpp:859
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr ""
 
-#: src/localplayer.cpp:861
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr ""
 
-#: src/localplayer.cpp:862
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr ""
 
-#: src/main.cpp:253
+#: src/main.cpp:255
 msgid "Invalid update host: "
 msgstr ""
 
-#: src/main.cpp:286 src/main.cpp:292
+#: src/main.cpp:288 src/main.cpp:294
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/main.cpp:325
+#: src/main.cpp:327
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: src/main.cpp:481
+#: src/main.cpp:483
 msgid "Couldn't set "
 msgstr ""
 
-#: src/main.cpp:482
+#: src/main.cpp:484
 msgid " video mode: "
 msgstr ""
 
-#: src/main.cpp:562
+#: src/main.cpp:566
 msgid "tmw"
 msgstr ""
 
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid "  -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid "  -d --data       : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid "  -D --default    : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
 msgstr ""
 
 #: src/main.cpp:568
-msgid "  -h --help       : Display this help"
+msgid "  -C --config-file : Configuration file to use"
 msgstr ""
 
 #: src/main.cpp:569
-msgid "  -S --homedir    : Directory to use as home directory"
+msgid "  -d --data        : Directory to load game data from"
 msgstr ""
 
 #: src/main.cpp:570
-msgid "  -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid "  -P --password   : Login with this password"
+msgid "  -D --default     : Choose default character server and character"
 msgstr ""
 
 #: src/main.cpp:572
-msgid "  -c --character  : Login with this character"
-msgstr ""
+#, fuzzy
+msgid "  -h --help        : Display this help"
+msgstr "/help > 顯示幫助"
 
 #: src/main.cpp:573
-msgid "  -o --port       : Login Server Port"
+msgid "  -S --home-dir    : Directory to use as home directory"
 msgstr ""
 
 #: src/main.cpp:574
-msgid "  -s --server     : Login Server name or IP"
+msgid "  -H --update-host : Use this update host"
 msgstr ""
 
 #: src/main.cpp:575
-msgid "  -u --skipupdate : Skip the update downloads"
+msgid "  -P --password    : Login with this password"
 msgstr ""
 
 #: src/main.cpp:576
-msgid "  -U --username   : Login with this username"
+msgid "  -c --character   : Login with this character"
 msgstr ""
 
 #: src/main.cpp:577
-msgid "  -v --version    : Display the version"
+msgid "  -p --port        : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid "  -s --server      : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid "  -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid "  -U --username    : Login with this username"
 msgstr ""
 
 #: src/main.cpp:582
+msgid "  -O --no-opengl   : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid "  -v --version     : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
 msgid "The Mana World "
 msgstr ""
 
-#: src/main.cpp:1499
+#: src/main.cpp:1515
 msgid "Connecting to map server..."
 msgstr "正在連接到地圖伺服器..."
 
-#: src/main.cpp:1507
+#: src/main.cpp:1523
 msgid "Connecting to character server..."
 msgstr "正在連接角色伺服器..."
 
-#: src/main.cpp:1515
+#: src/main.cpp:1531
 msgid "Connecting to account server..."
 msgstr "正在連接帳號伺服器..."
 
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
 msgid "Kick succeeded!"
 msgstr ""
 
@@ -2226,18 +2242,18 @@ msgstr ""
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
+#: src/net/ea/chathandler.cpp:78
 msgid "Whisper could not be sent, user is offline"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
+#: src/net/ea/chathandler.cpp:81
 msgid "Whisper could not be sent, ignored by user"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:203 src/net/ea/chathandler.cpp:209
-#: src/net/ea/chathandler.cpp:214 src/net/ea/chathandler.cpp:219
-#: src/net/ea/chathandler.cpp:224 src/net/ea/chathandler.cpp:229
-#: src/net/ea/chathandler.cpp:234 src/net/ea/chathandler.cpp:239
+#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
+#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
+#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
+#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
 msgid "Channels are not supported!"
 msgstr ""
 
@@ -2249,185 +2265,193 @@ msgstr ""
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:90 src/net/tmwserv/generalhandler.cpp:80
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "力量"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "體力"
 
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "智力"
 
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "閃躲"
 
-#: src/net/ea/generalhandler.cpp:100
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "幸運"
 
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:118
 msgid "Authentication failed"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:126
+#: src/net/ea/generalhandler.cpp:121
 msgid "No servers available"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:129
+#: src/net/ea/generalhandler.cpp:125
+msgid "Someone else is trying to use this account"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:128
 msgid "This account is already logged in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:131
 msgid "Speed hack detected"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:134
 msgid "Duplicated login"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:137
 msgid "Unknown connection error"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:197
+#: src/net/ea/generalhandler.cpp:194
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:55
+msgid "/help > Display this help."
+msgstr "/help > 顯示幫助"
+
+#: src/net/ea/gui/partytab.cpp:56
 msgid "/create > Create a new party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:57
 msgid "/new > Alias of create"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:58
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:59
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:71
 msgid "Command: /new <party-name>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:72
 msgid "Command: /create <party-name>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:73
 msgid "These commands create a new party called <party-name>."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:77
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:89
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:90
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:91
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:95
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:99
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:100
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:101
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:105
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:111
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Party name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:134 src/net/ea/partyhandler.cpp:188
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:137 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:140 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:166 src/net/ea/partyhandler.cpp:165
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:169 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:172 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -2437,361 +2461,367 @@ msgstr ""
 
 #: src/net/ea/inventoryhandler.cpp:194
 #, c-format
-msgid "You picked up %s [%s]"
+msgid "You picked up %s [@@%d|%s@@]"
 msgstr ""
 
 #: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:111
+#: src/net/ea/loginhandler.cpp:110
 msgid "Unregistered ID"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
 msgid "Wrong password"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
 msgid "Account expired"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
 msgid "Rejected from server"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:124
+#: src/net/ea/loginhandler.cpp:123
 msgid ""
 "You have been permanently banned from the game. Please contact the GM Team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:127
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 " Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:135
+#: src/net/ea/loginhandler.cpp:134
 msgid "This user name is already taken"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:138
+#: src/net/ea/loginhandler.cpp:137 src/net/tmwserv/loginhandler.cpp:89
+#: src/net/tmwserv/loginhandler.cpp:119 src/net/tmwserv/loginhandler.cpp:152
+#: src/net/tmwserv/loginhandler.cpp:188 src/net/tmwserv/loginhandler.cpp:220
 msgid "Unknown error"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:229
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:323
+#: src/net/ea/partyhandler.cpp:299
+msgid "Inviting like this isn't supported at the moment."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114
-msgid "Insert coin to continue"
+#: src/net/ea/playerhandler.cpp:102
+msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:120
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:121
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:124
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:125
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:138
+#: src/net/ea/playerhandler.cpp:126
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:127
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:128
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:141
+#: src/net/ea/playerhandler.cpp:129
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:142
+#: src/net/ea/playerhandler.cpp:130
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:144
+#: src/net/ea/playerhandler.cpp:132
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:145
+#: src/net/ea/playerhandler.cpp:133
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:258 src/net/ea/playerhandler.cpp:281
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:247
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:301
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:424
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "交易失敗！"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "顯示表情失敗！"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "坐下休息失敗！"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "聊天新增失敗！"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "不能加入隊伍！"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "無法大叫！"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒達到足夠等級！"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "HP不夠！"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "SP不夠！"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能！"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "你需要再一顆紅寶石!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "你需要再一棵藍寶石!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "你已負重太多，不能再多!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "傳送失敗..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "無法偷取任何物品..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr ""
 
@@ -2811,40 +2841,96 @@ msgstr ""
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/tmwserv/chathandler.cpp:151
+#: src/net/tmwserv/chathandler.cpp:157
 msgid "Topic: "
 msgstr ""
 
-#: src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Willpower: %d"
+#: src/net/tmwserv/generalhandler.cpp:87
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "意志力:"
+
+#: src/net/tmwserv/loginhandler.cpp:80
+msgid "Wrong magic_token"
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+msgid "Already logged in"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+msgid "Server is full"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:110
+msgid "New password incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:140
+msgid "New email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+msgid "Client version is too old"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:179
+msgid "Wrong username or password"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
 msgid "items.xml"
 msgstr ""
 
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
 msgid "Unnamed"
 msgstr "未知物品"
 
@@ -2859,3 +2945,12 @@ msgstr ""
 #: src/resources/npcdb.cpp:53
 msgid "NPC Database: Error while loading npcs.xml!"
 msgstr ""
+
+#~ msgid "Save player list"
+#~ msgstr "保存玩家列表"
+
+#~ msgid "Scroll radius"
+#~ msgstr "捲動半徑"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "捲動延遲"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7da3be89..5a7d7729 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-13 19:40+0200\n"
 "PO-Revision-Date: 2009-05-11 03:32+0000\n"
 "Last-Translator: netwareboss <netwareboss@gmail.com>\n"
-"Language-Team: Traditional Chinese <themanaworld-"
-"devel@lists.sourceforge.net>\n"
+"Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
+"net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,294 +22,294 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/commandhandler.cpp:141
+#: src/commandhandler.cpp:142
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:143
 msgid "/help > Display this help"
 msgstr "/help >顯示指令說明"
 
-#: src/commandhandler.cpp:144
+#: src/commandhandler.cpp:145
 msgid "/where > Display map name"
 msgstr "/where > 顯示地圖名稱"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:146
 msgid "/who > Display number of online users"
 msgstr "/who > 顯示線上使用者的數量"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:147
 msgid "/me > Tell something about yourself"
 msgstr "/me > 顯示關於自己的資訊"
 
-#: src/commandhandler.cpp:148
+#: src/commandhandler.cpp:149
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除這個視窗"
 
-#: src/commandhandler.cpp:150
+#: src/commandhandler.cpp:151
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 傳送私人訊息給某使用者"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:152
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > 效果同 msg"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:153
 msgid "/w > Alias of msg"
 msgstr "/w > 效果同 msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:154
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > 建立與另一個使用者的私人訊息分頁"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:155
 msgid "/q > Alias of query"
 msgstr "/q > 效果同 query"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:157
 msgid "/list > Display all public channels"
 msgstr "/list > 顯示所有公開頻道"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:158
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入或建立頻道"
 
-#: src/commandhandler.cpp:159
+#: src/commandhandler.cpp:160
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀請使用者組隊"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:162
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 開始紀錄對話內容到外部檔案"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:163
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:164
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 取得上線玩家的清單（如果開啟記錄，傳送到聊天紀錄）"
 
-#: src/commandhandler.cpp:165
+#: src/commandhandler.cpp:166
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 全域廣播 (GM 專用)"
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:170
 msgid "For more information, type /help <command>"
 msgstr "輸入/help <指令> 獲取更多幫助訊息"
 
-#: src/commandhandler.cpp:173
+#: src/commandhandler.cpp:174
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:175
 msgid "This command displays a list of all commands available."
 msgstr "該指令可顯示所有可用指令。"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:176
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:177
 msgid "This command displays help on <command>."
 msgstr "該指令會顯示<指令>的幫助訊息"
 
-#: src/commandhandler.cpp:184
+#: src/commandhandler.cpp:185
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信息>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:186
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:187
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "該指令會發送<信息>給所有線上用戶。"
 
-#: src/commandhandler.cpp:191
+#: src/commandhandler.cpp:192
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:193
 msgid "This command clears the chat log of previous chat."
 msgstr "該指令可以清除聊天紀錄。"
 
-#: src/commandhandler.cpp:196
+#: src/commandhandler.cpp:197
 msgid "Command: /join <channel>"
 msgstr "指令: /join <頻道名稱>"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:198
 msgid "This command makes you enter <channel>."
 msgstr "這個指令可以讓你輸入 <頻道名稱>."
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:199
 msgid "If <channel> doesn't exist, it's created."
 msgstr "假如 <頻道名稱> 不存在,那就建立."
 
-#: src/commandhandler.cpp:202
+#: src/commandhandler.cpp:203
 msgid "Command: /list"
 msgstr "指令： /list"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:204
 msgid "This command shows a list of all channels."
 msgstr "這個指令會顯示所有頻道的清單。"
 
-#: src/commandhandler.cpp:207
+#: src/commandhandler.cpp:208
 msgid "Command: /me <message>"
 msgstr "指令： /me <message>"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:209
 msgid "This command tell others you are (doing) <msg>."
 msgstr "這個指令會告訴其他人您正在做 <msg> 的事。"
 
-#: src/commandhandler.cpp:212
+#: src/commandhandler.cpp:213
 msgid "Command: /msg <nick> <message>"
 msgstr "指令： /msg <nick> <message>"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:214
 msgid "Command: /whisper <nick> <message>"
 msgstr "指令： /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:215
 msgid "Command: /w <nick> <message>"
 msgstr "指令： /w <nick> <message>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:216
 msgid "This command sends the text <message> to <nick>."
 msgstr "這個指令會傳送 <message> 的文字給 <nick>。"
 
-#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
+#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
 #: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:222
 msgid "Command: /query <nick>"
 msgstr "指令： /query <nick>"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:223
 msgid "Command: /q <nick>"
 msgstr "指令： /q <nick>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:224
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "這個指令會嘗試建立您和 <nick> 之間的悄悄話分頁。"
 
-#: src/commandhandler.cpp:228
+#: src/commandhandler.cpp:229
 msgid "Command: /party <nick>"
 msgstr "指令： /party <nick>"
 
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr "這個指令會邀請 <nick> 跟您組隊。"
 
-#: src/commandhandler.cpp:235
+#: src/commandhandler.cpp:236
 msgid "Command: /present"
 msgstr "指令： /present"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:237
 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/commandhandler.cpp:242
+#: src/commandhandler.cpp:243
 msgid "Command: /record <filename>"
 msgstr "指令： /record <filename>"
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:244
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
 
-#: src/commandhandler.cpp:245
+#: src/commandhandler.cpp:246
 msgid "Command: /record"
 msgstr "指令： /record"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:247
 msgid "This command finishes a recording session."
 msgstr "這個指令會結束錄製的作業階段。"
 
-#: src/commandhandler.cpp:250
+#: src/commandhandler.cpp:251
 msgid "Command: /toggle <state>"
 msgstr "指令： /toggle <state>"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:252
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:253
+#: src/commandhandler.cpp:254
 msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
+"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
+"\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
-"可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開，或是 \"0\"、\"no\"、\"false\" 來代表切換為關閉."
+"可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開，或是 \"0\"、\"no\"、"
+"\"false\" 來代表切換為關閉."
 
-#: src/commandhandler.cpp:256
+#: src/commandhandler.cpp:257
 msgid "Command: /toggle"
 msgstr "指令： /toggle"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:258
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:262
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:263
 msgid "This command displays the name of the current map."
 msgstr "這個指令顯示目前地圖名。"
 
-#: src/commandhandler.cpp:266
+#: src/commandhandler.cpp:267
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:268
 msgid "This command displays the number of players currently online."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:273
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:274
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
 
-#: src/commandhandler.cpp:339
+#: src/commandhandler.cpp:340
 msgid "Cannot send empty whispers!"
 msgstr "傳送密語失敗"
 
-#: src/commandhandler.cpp:346
+#: src/commandhandler.cpp:347
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick '%s'! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: src/commandhandler.cpp:393
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:402
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:405
+#: src/commandhandler.cpp:406
 msgid "Message now closes chat."
 msgstr ""
 
 #: src/commandhandler.h:31
 #, c-format
-msgid ""
-"Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
 #: src/game.cpp:236
@@ -332,25 +332,25 @@ msgstr "已中斷連線到伺服器,程式將要離開"
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:653 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
 #: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Quit"
 msgstr "離開"
 
-#: src/game.cpp:647
+#: src/game.cpp:654
 msgid "Are you sure you want to quit?"
 msgstr "您確定要離開?"
 
-#: src/game.cpp:654
+#: src/game.cpp:661
 msgid "no"
 msgstr "否"
 
-#: src/game.cpp:794
+#: src/game.cpp:801
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
-#: src/game.cpp:801
+#: src/game.cpp:808
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
@@ -399,7 +399,7 @@ msgstr "出售"
 #: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
 #: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
 #: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
+#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
 #: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
 #: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
 #: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
@@ -505,7 +505,7 @@ msgstr "帳號與角色管理"
 msgid "Select Character"
 msgstr "選擇角色"
 
-#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:95
 #: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
 #: src/gui/serverdialog.cpp:103
 msgid "Ok"
@@ -515,7 +515,7 @@ msgstr "確認"
 msgid "Previous"
 msgstr "上一個"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
 msgid "Next"
 msgstr "下一個"
 
@@ -540,7 +540,7 @@ msgstr "新增"
 
 #: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
 #: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "刪除"
 
@@ -570,24 +570,20 @@ msgstr "金錢: %s"
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:332
+#: src/gui/chat.cpp:324
 #, c-format
 msgid "%d players are present."
 msgstr "%d 位玩家的清單"
 
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:325
 msgid "Present: "
 msgstr "上線: "
 
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:342
 msgid "Attendance written to record log."
 msgstr "將上線訊息寫入錄製紀錄。"
 
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:467
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -608,11 +604,11 @@ msgstr "連線中..."
 msgid "Unable to load selection.png"
 msgstr "無法讀取 selection.png"
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
+#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
 #: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
 msgid "Unequip"
 msgstr "卸下裝備"
@@ -637,7 +633,7 @@ msgstr "離開公會"
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
 msgid "Close"
 msgstr "關閉"
 
@@ -651,7 +647,7 @@ msgid "Equip"
 msgstr "裝備"
 
 #: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:150
 msgid "Use"
 msgstr "使用"
 
@@ -671,27 +667,27 @@ msgstr "欄位:"
 msgid "Weight:"
 msgstr "重量:"
 
-#: src/gui/itemamount.cpp:95
+#: src/gui/itemamount.cpp:97
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:121
+#: src/gui/itemamount.cpp:123
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamount.cpp:124
+#: src/gui/itemamount.cpp:126
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamount.cpp:127
+#: src/gui/itemamount.cpp:129
 msgid "Select amount of items to store."
 msgstr "選擇要儲存的物品數量。"
 
-#: src/gui/itemamount.cpp:130
+#: src/gui/itemamount.cpp:132
 msgid "Select amount of items to retrieve."
 msgstr "選擇要取回的物品數量。"
 
-#: src/gui/itemamount.cpp:133
+#: src/gui/itemamount.cpp:135
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
@@ -730,7 +726,7 @@ msgid "Register"
 msgstr "註冊"
 
 #: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:771
 msgid "Magic"
 msgstr "魔法"
 
@@ -746,31 +742,23 @@ msgstr "施展測試咒文 2"
 msgid "Cast Test Spell 3"
 msgstr "施展測試咒文 3"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:85
 msgid "Map"
 msgstr "地圖"
 
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
 msgid "Waiting for server"
 msgstr "等待伺服器中"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
 msgid "Submit"
 msgstr "確認"
 
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr "增加"
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr "減少"
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
 msgid "Reset"
 msgstr "重設"
 
@@ -778,8 +766,7 @@ msgstr "重設"
 msgid "Send"
 msgstr "傳送"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "文字"
 
@@ -831,8 +818,8 @@ msgstr "悄悄話"
 msgid "Is"
 msgstr "是"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
+#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr "隊伍"
 
@@ -972,99 +959,112 @@ msgstr "1/2 HP 量"
 msgid "1/4 HP Bar"
 msgstr "1/4 HP 量"
 
-#: src/gui/popupmenu.cpp:75
+#: src/gui/partywindow.cpp:70
+#, fuzzy, c-format
+msgid "Party (%s)"
+msgstr "隊伍"
+
+#: src/gui/popupmenu.cpp:77
 msgid "@@name|Add name to chat@@"
 msgstr "@@name|增加聊天名單@@"
 
-#: src/gui/popupmenu.cpp:87
+#: src/gui/popupmenu.cpp:89
 #, c-format
 msgid "@@trade|Trade With %s@@"
 msgstr "@@交易|與%s交易@@"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
 #, c-format
 msgid "@@attack|Attack %s@@"
 msgstr "@@攻擊|攻擊%s@@"
 
-#: src/gui/popupmenu.cpp:94
+#: src/gui/popupmenu.cpp:96
 #, c-format
 msgid "@@friend|Befriend %s@@"
 msgstr "@@friend|與%s交朋友@@"
 
-#: src/gui/popupmenu.cpp:97
+#: src/gui/popupmenu.cpp:99
 #, c-format
 msgid "@@disregard|Disregard %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:98
+#: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "@@ignore|Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
+#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
 #, c-format
 msgid "@@unignore|Un-Ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:103
+#: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "@@ignore|Completely ignore %s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:113
+#: src/gui/popupmenu.cpp:116
 #, c-format
 msgid "@@guild|Invite %s to join your guild@@"
 msgstr "@@guild|邀請 %s 加入你的公會@@"
 
-#: src/gui/popupmenu.cpp:114
+#: src/gui/popupmenu.cpp:119
 #, c-format
 msgid "@@party|Invite %s to join your party@@"
 msgstr "@@party|邀請 %s 加入你的隊伍@@"
 
-#: src/gui/popupmenu.cpp:125
+#: src/gui/popupmenu.cpp:124
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:132
 #, c-format
 msgid "@@talk|Talk To %s@@"
 msgstr "@@對話|與 %s 對話@@"
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
-#: src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:141
+msgid "@@admin-kick|Kick monster@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
+#: src/gui/popupmenu.cpp:383
 msgid "@@cancel|Cancel@@"
 msgstr "@@取消|取消@@"
 
-#: src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:165
 #, c-format
 msgid "@@pickup|Pick up %s@@"
 msgstr "@@pickup|撿起 %s @@"
 
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|加入聊天@@"
 
-#: src/gui/popupmenu.cpp:348
+#: src/gui/popupmenu.cpp:356
 msgid "@@use|Unequip@@"
 msgstr "@@使用|卸下@@"
 
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:358
 msgid "@@use|Equip@@"
 msgstr "@@使用|裝備@@"
 
-#: src/gui/popupmenu.cpp:353
+#: src/gui/popupmenu.cpp:361
 msgid "@@use|Use@@"
 msgstr "@@使用|使用@@"
 
-#: src/gui/popupmenu.cpp:355
+#: src/gui/popupmenu.cpp:363
 msgid "@@drop|Drop@@"
 msgstr "@@丟棄|丟棄@@"
 
-#: src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:367
 msgid "@@split|Split@@"
 msgstr "@@分離|分離@@"
 
-#: src/gui/popupmenu.cpp:364
+#: src/gui/popupmenu.cpp:372
 msgid "@@store|Store@@"
 msgstr "@@store|"
 
-#: src/gui/popupmenu.cpp:371
+#: src/gui/popupmenu.cpp:379
 msgid "@@retrieve|Retrieve@@"
 msgstr ""
 
@@ -1296,26 +1296,22 @@ msgid "???"
 msgstr "???"
 
 #: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "保存玩家列表"
-
-#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
 msgid "Put all whispers in tabs"
 msgstr "將所有的悄悄話放到分頁中"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr "當忽略時："
 
@@ -1335,178 +1331,168 @@ msgstr "中型"
 msgid "Large"
 msgstr "大型"
 
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr "沒有文字"
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr "有聊天泡泡,沒名字"
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr "聊天泡泡加名字"
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "關閉"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_video.cpp:187
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
 msgid "Visible names"
 msgstr "可見的名稱"
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
 msgid "Show name"
 msgstr "顯示名稱"
 
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
 msgid "Show pickup notification"
 msgstr "顯示撿拾通知"
 
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
 msgid "in chat"
 msgstr "聊天中"
 
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
 msgid "as particle"
 msgstr "如同練習"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
 msgid "FPS Limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
 msgid "Overhead text"
 msgstr "置頂文字"
 
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "捲動半徑"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "捲動延遲"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
 msgid "Particle Detail"
 msgstr "紋理細節"
 
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
 msgid "Font size"
 msgstr "字型大小"
 
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr "沒有文字"
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr "有聊天泡泡,沒名字"
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr "聊天泡泡加名字"
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "關閉"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "低"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "高"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "中"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "最大"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
 msgid "Failed to switch to "
 msgstr "無法切換到 "
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
 msgid "windowed"
 msgstr "視窗化"
 
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
 msgid "fullscreen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
 msgid "mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
 msgid "Switching to full screen"
 msgstr "切換全螢幕"
 
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
 msgid "Changing OpenGL"
 msgstr "切換為OpenGL"
 
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
 msgid "Screen resolution changed"
 msgstr "螢幕解析度已變更"
 
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
 msgid "Restart your client for the change to take effect."
 msgstr "請重新啟動您的客戶端讓變更生效。"
 
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
 msgid "Particle effect settings changed."
 msgstr "粒子效果設定值已變更。"
 
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
 msgid "Changes will take effect on map change."
 msgstr "變更會在地圖改變後生效。"
 
-#: src/gui/skill.cpp:41
+#: src/gui/skill.cpp:44
 msgid "skills.xml"
 msgstr "skills.xml"
 
-#: src/gui/skill.cpp:50
+#: src/gui/skill.cpp:53
 msgid "Mystery Skill"
 msgstr "神秘技能"
 
-#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
 #, c-format
 msgid "Skill points: %d"
 msgstr "技能點數：%d"
 
-#: src/gui/skill.cpp:146
+#: src/gui/skill.cpp:149
 msgid "Up"
 msgstr "升級"
 
@@ -1673,8 +1659,7 @@ msgid "Change"
 msgstr "更改"
 
 #: src/gui/trade.cpp:268
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
 #: src/gui/trade.cpp:311
@@ -1803,7 +1788,7 @@ msgstr "%s 主要公告："
 msgid "%s whispers: "
 msgstr "%s 的悄悄話: "
 
-#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
+#: src/gui/widgets/chattab.cpp:233 src/resources/itemdb.cpp:107
 msgid "Unknown item"
 msgstr "不明的物品"
 
@@ -1860,202 +1845,207 @@ msgid "Attack"
 msgstr "攻擊"
 
 #: src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "Target & Attack"
+msgstr "停止攻擊"
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:48
 msgid "Talk"
 msgstr "說話"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:49
 msgid "Stop Attack"
 msgstr "停止攻擊"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:50
 msgid "Target Closest"
 msgstr "最接近的目標"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:52
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:54
 msgid "Hide Windows"
 msgstr "隱藏視窗"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:55
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:56
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:58
 msgid "Find Path to Mouse"
 msgstr "尋找至滑鼠的路徑"
 
-#: src/keyboardconfig.cpp:58 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: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 "物品捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr "物品欄視窗"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:74
 msgid "Equipment WIndow"
 msgstr "裝備視窗"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr "聊天視窗"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr "物品捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr "程式除錯視窗"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr "隊伍視窗"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr "表情捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:82 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: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 "表情捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95
 msgid "Toggle Chat"
 msgstr "切換聊天"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:96
 msgid "Scroll Chat Up"
 msgstr "將聊天向上捲動"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Down"
 msgstr "將聊天向下捲動"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Previous Chat Tab"
 msgstr "前一個聊天分頁"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Next Chat Tab"
 msgstr "下一個聊天分頁"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Select OK"
 msgstr "選擇確定"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:103
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:760
 msgid "Unarmed"
 msgstr "未命名"
 
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:761
 msgid "Knife"
 msgstr "小刀"
 
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:762
 msgid "Sword"
 msgstr "劍"
 
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:763
 msgid "Polearm"
 msgstr "長戰斧"
 
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:764
 msgid "Staff"
 msgstr "杖"
 
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:765
 msgid "Whip"
 msgstr "鞭子"
 
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:766
 msgid "Bow"
 msgstr "弓"
 
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:767
 msgid "Shooting"
 msgstr "射擊"
 
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:768
 msgid "Mace"
 msgstr "錘"
 
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:769
 msgid "Axe"
 msgstr "斧"
 
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:770
 msgid "Thrown"
 msgstr "投擲"
 
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:772
 msgid "Craft"
 msgstr "工藝品"
 
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:773
 msgid "Unknown Skill"
 msgstr "不明的技能"
 
@@ -2267,210 +2257,210 @@ msgstr "無法裝備。"
 msgid "Unable to unequip."
 msgstr "無法卸下裝備。"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Strength %+d"
 msgstr "力量: %d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Agility %+d"
 msgstr "敏捷: %d"
 
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Vitality %+d"
 msgstr "體力: %d"
 
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Intelligence %+d"
 msgstr "智力: %d"
 
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Dexterity %+d"
 msgstr "閃躲: %d"
 
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
 msgstr "幸運: %d"
 
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
 msgid "No servers available"
 msgstr "沒有可用的伺服器"
 
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
 msgid "Someone else is trying to use this account"
 msgstr "此帳號正在使用中"
 
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
 msgid "This account is already logged in"
 msgstr "這個帳號已經登入"
 
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
 msgid "Speed hack detected"
 msgstr "使用加速器"
 
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
 msgid "Duplicated login"
 msgstr "重複登入"
 
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
 msgid "Unknown connection error"
 msgstr "不明的連線錯誤"
 
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
 msgid "/help > Display this help."
 msgstr "/help > 顯示這個說明文件。"
 
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
 msgid "/create > Create a new party"
 msgstr "/create > 建立新的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
 msgid "/new > Alias of create"
 msgstr "/new > 效果同 create 指令"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀請玩家加入您的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 離開您加入的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > 從您加入的隊伍中把某人踢出"
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 顯示/改變隊伍道具分享選項"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 顯示/改變隊伍經驗值分享選項"
 
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
 msgid "Command: /new <party-name>"
 msgstr "指令： /new <party-name>"
 
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
 msgid "Command: /create <party-name>"
 msgstr "指令： /create <party-name>"
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
 msgid "These commands create a new party called <party-name>."
 msgstr "這些指令會建立叫做 <party-name> 的新隊伍。"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
 msgid "Command: /invite <nick>"
 msgstr "指令： /invite <nick>"
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /leave"
 msgstr "指令： /leave"
 
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command causes the player to leave the party."
 msgstr "這個指令會使玩家離開隊伍。"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
 msgid "Command: /item <policy>"
 msgstr "指令： /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
 msgid "This command changes the party's item sharing policy."
 msgstr "這個指令會改變隊伍的道具分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享，或是 \"0\"、\"no\"、\"false\" "
-"來停用道具分享。"
+"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享，或是 \"0\"、"
+"\"no\"、\"false\" 來停用道具分享。"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
 msgid "Command: /item"
 msgstr "指令： /item"
 
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
 msgid "This command displays the party's current item sharing policy."
 msgstr "這個指令會顯示此隊伍目前的道具分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
 msgid "Command: /exp <policy>"
 msgstr "指令： /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
 msgid "This command changes the party's experience sharing policy."
 msgstr "這個指令會改變此隊伍的經驗值分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享，或是 \"0\"、\"no\"、\"false\" "
-"來停用經驗值分享。"
+"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享，或是 \"0\"、"
+"\"no\"、\"false\" 來停用經驗值分享。"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
 msgid "Command: /exp"
 msgstr "指令： /exp"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
 msgid "This command displays the party's current experience sharing policy."
 msgstr "這個指令會顯示此隊伍目前的經驗值分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
 msgid "Party name is missing."
 msgstr "漏掉隊伍名稱。"
 
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
 msgid "Item sharing enabled."
 msgstr "物品分享已啟用。"
 
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
 msgid "Item sharing disabled."
 msgstr "物品分享已停用。"
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
 msgid "Item sharing not possible."
 msgstr "物品分享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
 msgid "Experience sharing enabled."
 msgstr "經驗值分享已啟用。"
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
 msgid "Experience sharing disabled."
 msgstr "經驗值分享已停用。"
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
 msgid "Experience sharing not possible."
 msgstr "經驗值分享不可能。"
 
-#: src/net/ea/inventoryhandler.cpp:183
+#: src/net/ea/inventoryhandler.cpp:184
 msgid "Unable to pick up item"
 msgstr "無法撿拾物品"
 
-#: src/net/ea/inventoryhandler.cpp:193
+#: src/net/ea/inventoryhandler.cpp:194
 #, c-format
 msgid "You picked up %s [@@%d|%s@@]"
 msgstr "你撿起了 %s [@@%d|%s@@]"
 
-#: src/net/ea/inventoryhandler.cpp:239
+#: src/net/ea/inventoryhandler.cpp:240
 msgid "Failed to use item"
 msgstr "使用物品失敗"
 
@@ -2542,25 +2532,25 @@ msgstr "%s 現在已經是您隊伍的成員。"
 msgid "Unknown invite response for %s."
 msgstr "給 %s 的不明邀請回應。"
 
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr "您已經離開此隊伍。"
 
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:238
 #, c-format
 msgid "%s has left your party."
 msgstr "%s 已經離開您的隊伍。"
 
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:273
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "不明的成員試著要說：%s"
 
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:299
 msgid "Inviting like this isn't supported at the moment."
 msgstr "此時無法支援邀請"
 
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:328
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s 不在您的隊伍中！"
@@ -2680,7 +2670,7 @@ msgstr "您已是前-玩家。"
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
 msgid "Message"
 msgstr "訊息"
 
@@ -2689,147 +2679,147 @@ msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "您已經攜帶超過負重能力的一半。您將無法恢復生命。"
 
-#: src/net/ea/playerhandler.cpp:289
+#: src/net/ea/playerhandler.cpp:290
 msgid "You picked up "
 msgstr "您已經撿起 "
 
-#: src/net/ea/playerhandler.cpp:412
+#: src/net/ea/playerhandler.cpp:413
 msgid "Equip arrows first"
 msgstr "請先裝備弓箭"
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/skillhandler.cpp:139
 msgid "Trade failed!"
 msgstr "交易失敗！"
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/skillhandler.cpp:142
 msgid "Emote failed!"
 msgstr "顯示表情失敗！"
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/skillhandler.cpp:145
 msgid "Sit failed!"
 msgstr "坐下休息失敗！"
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/skillhandler.cpp:148
 msgid "Chat creating failed!"
 msgstr "聊天新增失敗！"
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/skillhandler.cpp:151
 msgid "Could not join party!"
 msgstr "不能加入隊伍！"
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/skillhandler.cpp:154
 msgid "Cannot shout!"
 msgstr "無法大叫！"
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/skillhandler.cpp:163
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒達到足夠等級！"
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/skillhandler.cpp:166
 msgid "Insufficient HP!"
 msgstr "HP不夠！"
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/skillhandler.cpp:169
 msgid "Insufficient SP!"
 msgstr "SP不夠！"
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/skillhandler.cpp:172
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/skillhandler.cpp:175
 msgid "You cannot do that right now!"
 msgstr "您現在不能那麼做！"
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/skillhandler.cpp:178
 msgid "Seems you need more money... ;-)"
 msgstr "看來您需要更多錢... ;-)"
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/skillhandler.cpp:181
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能！"
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/skillhandler.cpp:184
 msgid "You need another red gem!"
 msgstr "你需要再一顆紅寶石!"
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/skillhandler.cpp:187
 msgid "You need another blue gem!"
 msgstr "你需要再一棵藍寶石!"
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/skillhandler.cpp:190
 msgid "You're carrying to much to do this!"
 msgstr "你已負重太多，不能再多!"
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/skillhandler.cpp:193
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/skillhandler.cpp:202
 msgid "Warp failed..."
 msgstr "傳送失敗..."
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/skillhandler.cpp:205
 msgid "Could not steal anything..."
 msgstr "無法偷取任何物品..."
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/skillhandler.cpp:208
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:101
 msgid "Request for trade"
 msgstr "交易的要求"
 
-#: src/net/ea/tradehandler.cpp:102
+#: src/net/ea/tradehandler.cpp:103
 msgid " wants to trade with you, do you accept?"
 msgstr " 想要跟您交易，您接受嗎？"
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:117
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易無法進行。交易對象太遠了。"
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:121
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "無法進行交易。該角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:125
 msgid "Trade cancelled due to an unknown reason."
 msgstr "由於不明的原因已取消交易。"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:131
 msgid "Trade: You and "
 msgstr "交易：您和 "
 
-#: src/net/ea/tradehandler.cpp:136
+#: src/net/ea/tradehandler.cpp:137
 msgid "Trade with "
 msgstr "交易對象: "
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/ea/tradehandler.cpp:138
 msgid " cancelled"
 msgstr " 已取消"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/ea/tradehandler.cpp:145
 msgid "Unhandled trade cancel packet"
 msgstr "未處理的交易取消封包"
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:195
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "加入物品失敗。交易的伙伴已經超重。"
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:200
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "加入物品失敗。交易對象沒有空的欄位。"
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:204
 msgid "Failed adding item for unknown reason."
 msgstr "由於不明的原因加入物品失敗。"
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:217
 msgid "Trade canceled."
 msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:224
 msgid "Trade completed."
 msgstr "交易已完成。"
 
@@ -2853,9 +2843,9 @@ msgstr "意志力:"
 msgid "Topic: "
 msgstr "主題: "
 
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
+#: src/net/tmwserv/generalhandler.cpp:87
+#, fuzzy, c-format
+msgid "Willpower %+d"
 msgstr "意志力: %d"
 
 #: src/net/tmwserv/loginhandler.cpp:80
@@ -2954,10 +2944,24 @@ msgstr "monsters.xml"
 msgid "NPC Database: Error while loading npcs.xml!"
 msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
 
+#~ msgid "+"
+#~ msgstr "增加"
+
+#~ msgid "-"
+#~ msgstr "減少"
+
+#~ msgid "Save player list"
+#~ msgstr "保存玩家列表"
+
+#~ msgid "Scroll radius"
+#~ msgstr "捲動半徑"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "捲動延遲"
+
 #~ msgid "MiniMap"
 #~ msgstr "小地圖"
 
-#, c-format
 #~ msgid "@@pickup|Pick Up %s@@"
 #~ msgstr "@@撿起|撿起%s@@"
 
@@ -3003,10 +3007,9 @@ msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
 #~ msgid "Cannont send empty whispers!"
 #~ msgstr "不能送出空的悄悄話！"
 
-#, c-format
 #~ msgid ""
-#~ "Cannont create a whisper tab for nick '%s'!It either already exists, or is "
-#~ "you."
+#~ "Cannont create a whisper tab for nick '%s'!It either already exists, or "
+#~ "is you."
 #~ msgstr "不能建立 nick 「%s」的悄悄話分頁！它已經存在，或者對象是你自己。"
 
 #~ msgid ""
@@ -3043,7 +3046,6 @@ msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
 #~ msgid "Necklace"
 #~ msgstr "項鍊"
 
-#, c-format
 #~ msgid "%s: %s"
 #~ msgstr "%s： %s"
 
@@ -3062,7 +3064,6 @@ msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
 #~ msgid "  -s --server     : Login Server name or IP"
 #~ msgstr "  -s --server  : 登入伺服器名稱或 IP"
 
-#, c-format
 #~ msgid "You picked up %s [%s]"
 #~ msgstr "您已經撿起 %s [%s]"