Large translation file update

Also updated the list of files with strings to translate, the contact
address and the copyright assignment.

31 files changed, 51200 insertions, 36935 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index eaa170ea..97a63827 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -14,6 +14,7 @@ hr
 id
 it
 ja
+#nds
 nl
 pl
 pt
diff --git a/po/Makevars b/po/Makevars
index 7ea0d129..9cb69886 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = The Mana World Development Team
+COPYRIGHT_HOLDER = The Mana Developers
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e4c7433c..738dd8a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,11 @@
 # List of source files which contain translatable strings.
 # Generated using: grep "_(" -Irl src | sort
 
+src/client.cpp
 src/commandhandler.cpp
 src/commandhandler.h
-src/engine.cpp
 src/game.cpp
+src/gui/beingpopup.cpp
 src/gui/buy.cpp
 src/gui/buysell.cpp
 src/gui/changeemaildialog.cpp
@@ -16,7 +17,6 @@ src/gui/confirmdialog.cpp
 src/gui/connectiondialog.cpp
 src/gui/debugwindow.cpp
 src/gui/equipmentwindow.cpp
-src/gui/guildwindow.cpp
 src/gui/help.cpp
 src/gui/inventorywindow.cpp
 src/gui/itemamount.cpp
@@ -28,7 +28,6 @@ src/gui/npcpostdialog.cpp
 src/gui/okdialog.cpp
 src/gui/outfitwindow.cpp
 src/gui/palette.cpp
-src/gui/partywindow.cpp
 src/gui/popupmenu.cpp
 src/gui/quitdialog.cpp
 src/gui/recorder.cpp
@@ -46,6 +45,7 @@ src/gui/setup_keyboard.cpp
 src/gui/setup_players.cpp
 src/gui/setup_video.cpp
 src/gui/skilldialog.cpp
+src/gui/socialwindow.cpp
 src/gui/specialswindow.cpp
 src/gui/statuswindow.cpp
 src/gui/storagewindow.cpp
@@ -68,6 +68,8 @@ src/net/ea/charserverhandler.cpp
 src/net/ea/chathandler.cpp
 src/net/ea/gamehandler.cpp
 src/net/ea/generalhandler.cpp
+src/net/ea/gui/guildtab.cpp
+src/net/ea/guildhandler.cpp
 src/net/ea/gui/partytab.cpp
 src/net/ea/inventoryhandler.cpp
 src/net/ea/loginhandler.cpp
diff --git a/po/ar.po b/po/ar.po
index fd78bec5..9394faae 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,577 +17,721 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "تثبيت"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "جارِ الاتّصال..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "ولوج"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "إنتقاء الشخصيّة"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "خطأ"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "كلمة السرّ:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "تغيير"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "إلغاء التسجيل"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "مغادرة"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:360
+msgid "Network Error"
+msgstr ""
+
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "الوصف: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "مغادرة"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "بيع"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "كلمة السرّ:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "إنشاء شخصيّة"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "الاسم:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "لون الشعر:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "قصّة الشعر:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "إنشاء"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, 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:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "خطأ"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "السّابق"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "التّالي"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "الاسم: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "المستوى: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "إلغاء التسجيل"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "جديد"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "تغيير"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "حذف"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "إلغاء التسجيل"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "النقود: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,182 +744,223 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "جارِ الاتّصال..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "العتاد"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "تجريد من العتاد"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "الاسم: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "مؤثّرات محيطة"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "العتاد"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "تجريد من العتاد"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "الجردة"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "استخدام"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "إسقاط"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "موافق"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "إسقاط"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "التأثير: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr ""
-
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "تغيير"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "خارطة صغيرة"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "التّالي"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "مغادرة"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "التّالي"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "تجريد من العتاد"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -791,329 +976,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "الحالة"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "استخدام"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "مهارات"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@تجارة|متاجرة مع %s@@"
 
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "مهاجمة %+d"
 
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "قوّة الذات:"
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, 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@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: 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
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@اقتطاف|اقتطاف %s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 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@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "تبديل الخادوم"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "تبديل الشخصيّة"
 
@@ -1133,137 +1284,181 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "تأكيد:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "البريد الإلكترونيّ:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "الخادوم:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "المنفذ:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "الخادوم:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "جارِ الاتّصال..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "مؤشّر مخصّص"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "تثبيت"
-
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "تطبيق"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "تصفير النوافذ"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "صوت"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "سمعيّ"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "تطبيق"
+
+#: src/gui/setup.cpp:51
+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,431 +1499,598 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "بيع"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "واقف"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "منخفض"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "مرتفع"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "مؤشّر مخصّص"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "حدّ FPS:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "مرئية"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "لا"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "جارِ ملء الشاشة"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "تغيير OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "مهارات"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "المستوى: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "المستوى: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "إنشاء شخصيّة"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "المستوى: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "النقود: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "إحصائيات الشخصيّة جيّدة"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "المستوى: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "اقتراح متاجرة"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "إضافة"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "تغيير"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "الاسم: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "جارِ الاتّصال..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1780,1209 +2142,1436 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "الحالة"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "الحالة"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "اختصار"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "تغيير"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "العتاد"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
+msgid "Social Window"
 msgstr "تصفير النوافذ"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "العتاد"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "القوّة:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "خفّة الحركة:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "نشاط:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "المهارة:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "الاسم:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "القوّة:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "خفّة الحركة:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "نشاط:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "ذكاء:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "المهارة:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "مهاجمة %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "دفاع %+d"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "مهاجمة %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "دفاع %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "إلغاء التسجيل"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "أنت تقدّم:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "إحصائيات الشخصيّة جيّدة"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "إحصائيات الشخصيّة جيّدة"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "إحصائيات الشخصيّة جيّدة"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "إحصائيات الشخصيّة جيّدة"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "قوّة الذات:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "قوّة الذات:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "قوّة الذات:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3003,20 +3592,48 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "إنتقاء الشخصيّة"
+#~ msgid "Description: %s"
+#~ msgstr "الوصف: %s"
+
+#~ msgid "Previous"
+#~ msgstr "السّابق"
+
+#~ msgid "New"
+#~ msgstr "جديد"
+
+#~ msgid "Ok"
+#~ msgstr "موافق"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@مهاجمة|هاجم %s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@إلغاء|إلغاء@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@استخدام|استخدام العتاد@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@استخدم|استخدم@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@إسقاط|إسقاط@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@قسم|قسم@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@استخدم|استخدم@@"
 
 #~ msgid "Scroll radius"
 #~ msgstr "نصف قطر اللفّ"
diff --git a/po/ca.po b/po/ca.po
index 473bbf41..80790a96 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-01-09 11:46+0000\n"
 "Last-Translator: Habari <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -17,577 +17,714 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr ""
+
+#: src/client.cpp:623
+msgid "Connecting to server"
+msgstr ""
+
+#: src/client.cpp:650
+msgid "Logging in"
+msgstr ""
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+msgid "Requesting characters"
+msgstr ""
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr ""
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+msgid "Password Change"
+msgstr ""
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "canvi"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+msgid "Unregister Successful"
+msgstr ""
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "sortir"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
 msgstr ""
 
-#: 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"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "sortir"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "nom"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr ""
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "canvi"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,181 +737,219 @@ msgstr "si"
 msgid "No"
 msgstr "no"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, c-format
+msgid "Map: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr ""
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, c-format
+msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "canvi"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "sortir"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -790,325 +965,292 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
+#: src/gui/popupmenu.cpp:84
 #, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
+msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/partywindow.cpp:182
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, c-format
-msgid "%s has invited you to join their party."
+msgid "Attack %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:92
 #, c-format
-msgid "%s has invited you to join the %s party."
+msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@trade|Trade With %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@attack|Attack %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@talk|Talk To %s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+msgid "Pick up %s"
 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
-#, c-format
-msgid "@@pickup|Pick up %s@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: 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
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
@@ -1128,135 +1270,176 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
+#: src/gui/serverdialog.cpp:143
+msgid "Server type:"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
+#: src/gui/serverdialog.cpp:183
+msgid "Connect"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:184
+msgid "Custom Server"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
+msgstr ""
+
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1299,430 +1482,591 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "no"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:323
+#, c-format
+msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:405
+#, c-format
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/skilldialog.cpp:416
+#, c-format
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:117
 #, c-format
-msgid "Job: %d"
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:147
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:210
+#, c-format
+msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+msgid "Create Party"
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/trade.cpp:51
-msgid "Propose trade"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+msgid "Money"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+msgid "Level"
+msgstr ""
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
 #: src/gui/trade.cpp:52
-msgid "Confirmed. Waiting..."
+msgid "Propose trade"
 msgstr ""
 
 #: src/gui/trade.cpp:53
-msgid "Agree trade"
+msgid "Confirmed. Waiting..."
 msgstr ""
 
 #: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "canvi"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1774,1206 +2118,1421 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "canvi"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/localplayer.cpp:761
-msgid "Knife"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/localplayer.cpp:762
-msgid "Sword"
+#: src/main.cpp:44
+msgid "Options:"
 msgstr ""
 
-#: src/localplayer.cpp:763
-msgid "Polearm"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/localplayer.cpp:764
-msgid "Staff"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/localplayer.cpp:765
-msgid "Whip"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/localplayer.cpp:766
-msgid "Bow"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/localplayer.cpp:767
-msgid "Shooting"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/localplayer.cpp:768
-msgid "Mace"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/localplayer.cpp:769
-msgid "Axe"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/localplayer.cpp:770
-msgid "Thrown"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/localplayer.cpp:772
-msgid "Craft"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:263
-msgid "Invalid update host: "
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/net/ea/adminhandler.cpp:63
+msgid "Kick failed!"
 msgstr ""
 
-#: src/main.cpp:576
-msgid "Options:"
+#: src/net/ea/adminhandler.cpp:65
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/net/ea/buysellhandler.cpp:110
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
+#: src/net/ea/buysellhandler.cpp:117
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/net/ea/buysellhandler.cpp:124
+msgid "Unable to buy."
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:130
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/net/ea/buysellhandler.cpp:132
+msgid "Unable to sell."
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/net/ea/charserverhandler.cpp:135
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
+msgid "Info"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/net/ea/charserverhandler.cpp:147
+msgid "Character deleted."
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/net/ea/charserverhandler.cpp:152
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+msgid "Strength:"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+msgid "Agility:"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+msgid "Vitality:"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+msgid "Intelligence:"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+msgid "Dexterity:"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/net/ea/charserverhandler.cpp:242
+msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
-msgid "Kick failed!"
+#: src/net/ea/chathandler.cpp:80
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
-msgid "Kick succeeded!"
+#: src/net/ea/chathandler.cpp:84
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell."
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying."
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "nom"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell."
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#, c-format
+msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#, c-format
+msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#, c-format
+msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#, c-format
+msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Info"
+#: src/net/ea/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Character deleted."
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:140
-msgid "Failed to delete character."
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
-msgid "Strength:"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
-msgid "Agility:"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
-msgid "Vitality:"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
-msgid "Intelligence:"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
-msgid "Dexterity:"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:229
-msgid "Luck:"
+#: src/net/ea/generalhandler.cpp:205
+msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
-msgid "Channels are not supported!"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/generalhandler.cpp:224
+msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:227
 #, c-format
-msgid "Dexterity %+d"
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:228
 #, c-format
-msgid "Luck %+d"
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:199
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2994,14 +3553,14 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
+
+#~ msgid "Ok"
+#~ msgstr "ok"
diff --git a/po/cs.po b/po/cs.po
index b4a6b2ed..a747fff7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,578 +17,721 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Nastavení"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Připojuji se..."
+
+#: src/client.cpp:650
+msgid "Logging in"
+msgstr ""
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Vyber postavu"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Chyba"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Heslo:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Změnit"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Zrušit registraci"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Nápověda --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "Pro více informací napište /help <příkaz>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:360
+msgid "Network Error"
+msgstr ""
+
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Nákup"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Popis: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Účinek: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Prodej"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Změnit e-mail"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Účet: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Uživatelské jméno musí být kratší než %d znaků."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Heslo musí být kratší než %d znaků."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Heslo musí být kratší než %d znaků."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Vytvořit postavu"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Barva vlasů:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Styl vlasů:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Vytvořit"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Chyba"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů."
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Potvrďte vymazání postavy"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Správa účtu a postavy"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Předchozí"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Další"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Jméno: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Úroveň: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Zrušit registraci"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Nová"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Změnit e-mail"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Zrušit registraci"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Peníze: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -601,181 +744,222 @@ msgstr "Ano"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Připojuji se..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Vybavení"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Jméno: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Účet: %s"
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Vybavení"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventář"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Vybavit"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Upustit"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Rozdělit"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Upustit"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství zboží, se kterým budete obchodovat."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství zboží, které chcete upustit."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Účinek: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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 "Server:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr ""
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Zapamatovat uživatelské jméno"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrace"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Změnit"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Další"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Další"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -791,327 +975,294 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Stav"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Dovednosti"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:84
 #, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
+msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Útok %+d"
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:92
 #, c-format
-msgid "@@trade|Trade With %s@@"
+msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "@@attack|Attack %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "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
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Přepněte postavu"
 
@@ -1131,135 +1282,179 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "E-mail:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Uživatelské jméno musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí být kratší než %d znaků."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
-msgid "Please type both the address and the port of a server."
-msgstr ""
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Připojuji se..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
 msgstr "Vyber server"
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Nastavení"
+#: src/gui/serverdialog.cpp:262
+msgid "Please type both the address and the port of a server."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup.cpp:51
+msgid "Apply"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1302,431 +1497,596 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Prodej"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Ne"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Dovednosti"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Dovednosti"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Úroveň: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Úroveň: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Vytvořit postavu"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Gildy"
+
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Úroveň: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Peníze: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Potvrďte vymazání postavy"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Úroveň: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Nabídnout obchod"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Změnit"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Jméno: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Připojuji se..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1778,1208 +2138,1433 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Globální oznámení:"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globální oznámení od %s:"
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Stav"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Gildy"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Stav"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Zkratka"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Vyber server"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Změnit"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Vybavení"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Vybavení"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Potvrďte vymazání postavy"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Síla:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalita:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Jméno:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Síla:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalita:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Útok %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Obrana %+d"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Útok %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Obrana %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Zrušit registraci"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "Změnit heslo"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Potvrďte vymazání postavy"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Potvrďte vymazání postavy"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Vyberte množství zboží, se kterým budete obchodovat."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3000,17 +3585,23 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Vyber postavu"
+#~ msgid "Description: %s"
+#~ msgstr "Popis: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Předchozí"
+
+#~ msgid "New"
+#~ msgstr "Nová"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
diff --git a/po/da.po b/po/da.po
index fbd753dc..245c5975 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,220 +17,336 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Opsætning"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Opretter forbindelse til bane serveren..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Log Ind"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Vælg Karakter"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Opretter forbindelse til bane serveren..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Fejl"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Adgangskode:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Ændre"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Frameld"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "Ugyldigt opdaterings host: "
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "Fejl under oprettelsen af opdateringen mappen!"
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "--Hjælp--"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 #, fuzzy
 msgid "/help > Display this help"
 msgstr "/help: Viser denne hjælp"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 #, fuzzy
 msgid "/where > Display map name"
 msgstr "/where: Viser bane navnet"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 #, fuzzy
 msgid "/who > Display number of online users"
 msgstr "/who: Viser antalet af online brugere"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 #, fuzzy
 msgid "/clear > Clears this window"
 msgstr "/clear: Rydder dette vindue"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 #, 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:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "@@party|Inviter %s med i dit party@@"
+
+#: src/commandhandler.cpp:178
 #, fuzzy
 msgid "/party > Invite a user to party"
 msgstr "@@party|Inviter %s med i dit party@@"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 #, fuzzy
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle: Bestemmer om <retur> bringer focus på chat loggen."
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 #, 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:166
+#: src/commandhandler.cpp:184
 #, fuzzy
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce: Global meddelelse (Kun for GM)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "For at få mere information, skriv /help <kommando>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <besked>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** kun tilgængelig for en GM ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 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:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "Denne commando rydder chat loggen"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Kommando: /toggle"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+"Denne kommando viser det antal af online brugere, der nuværende er online."
+
+#: src/commandhandler.cpp:221
 #, fuzzy
 msgid "Command: /join <channel>"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 #, fuzzy
 msgid "This command makes you enter <channel>."
 msgstr "Denne kommando viser hjælp for <kommando>"
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 #, fuzzy
 msgid "Command: /list"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 #, fuzzy
 msgid "This command shows a list of all channels."
 msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 #, fuzzy
 msgid "Command: /me <message>"
 msgstr "Kommando: /announce <besked>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 #, fuzzy
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <navn> <besked>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 #, fuzzy
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <navn> <besked>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 #, fuzzy
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 #, fuzzy
 msgid "This command sends the text <message> to <nick>."
 msgstr "Denne kommando sender beskeden <besked> til <navn>."
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 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:222
+#: src/commandhandler.cpp:246
 #, fuzzy
 msgid "Command: /query <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 #, fuzzy
 msgid "Command: /q <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Kommando /toggle <tilstand>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Denne kommando viser hjælp for <kommando>"
+
+#: src/commandhandler.cpp:258
 #, fuzzy
 msgid "Command: /party <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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."
@@ -239,31 +355,31 @@ msgstr ""
 "lytteradius, og sender listen til enten record loggen, hvis du optager, "
 "ellers er det chat loggen."
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:272
 #, fuzzy
 msgid "Command: /record <filename>"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 #, fuzzy
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "Denne commando rydder chat loggen"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 #, fuzzy
 msgid "Command: /record"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 #, fuzzy
 msgid "This command finishes a recording session."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "Kommando /toggle <tilstand>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -271,7 +387,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:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -280,68 +396,110 @@ msgstr ""
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Kommando: /toggle"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "kommando: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 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:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help for at få en liste med kommandoer"
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 #, fuzzy
 msgid "Cannot send empty whispers!"
 msgstr "Kan ikke råbe!"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
+msgstr ""
+
 #: src/commandhandler.h:31
 #, fuzzy, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
@@ -349,292 +507,289 @@ msgstr ""
 "Mulighederne til /toggle er \"yes\", \"no\", \"true\", \"false\", \"1\", \"0"
 "\"."
 
-#: src/engine.cpp:88
-#, fuzzy
-msgid "Could not load map"
-msgstr "Kunne ikke tilslutte sig gruppen!"
-
-#: src/engine.cpp:89
-#, fuzzy, c-format
-msgid "Error while loading %s"
-msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
-
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "Skærmbillede gemt under ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "Netværk Fejl"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Afslut"
-
-#: src/game.cpp:658
-#, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Er du sikker på at du gerne vil stoppe?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr "nej"
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer indkomne handels anmodninger"
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "Accepter indkomne handels anmodninger"
 
-#: src/gui/buddywindow.cpp:35
+#: src/game.cpp:946
 #, fuzzy
-msgid "Buddy"
-msgstr "Køb"
+msgid "Could Not Load Map"
+msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr ""
+#: src/game.cpp:947
+#, fuzzy, c-format
+msgid "Error while loading %s"
+msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
+
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Gruppe"
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, fuzzy, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %d GP / Total: %d GP"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
+
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Afslut"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
 #, fuzzy
 msgid "Max"
 msgstr "maks"
 
-#: 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 "Beskrivelse: %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 "Effekt: %s"
-
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 #, fuzzy
 msgid "Shop"
 msgstr "Butik"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Sælg"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Bruger: %s"
 
-#: src/gui/changeemaildialog.cpp:49
+#: src/gui/changeemaildialog.cpp:51
 #, fuzzy
-msgid "Type New Email Address twice:"
+msgid "Type new email address twice:"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Brugernavnet skal mindst være %d bogstaver langt."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Skift e-mail adresse"
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "Skift e-mail adresse"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Adgangskoden skal mindst være %d bogstaver langt."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "Skift e-mail adresse"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Lav Bruger"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Hårfarve:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Frisure:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Opret"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Mand"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Kvinde"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Du mangler at fordele %d points"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Fejl"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Du har brugt alle dine points"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Bekræft sletning af karakter"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakter?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Ret konto og karakter"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "OK"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Forrige"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Næste"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Navn: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Niveau: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Frameld"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Opret"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Skift e-mail adresse"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Frameld"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Penge: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, fuzzy, c-format
-msgid "Job Level: %d"
-msgstr "Niveau: %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Luk"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, fuzzy, c-format
-msgid "Money: %s"
-msgstr "Penge: %d"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 #, fuzzy
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "Til stede: "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "Fremmøde skrives til loggen"
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, fuzzy, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til "
@@ -647,193 +802,230 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Opretter forbindelse..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Udstyr"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Tag af"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-#, fuzzy
-msgid "Guild"
-msgstr "Klaner"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-#, fuzzy
-msgid "Create Guild"
-msgstr "Opret"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Navn: %s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Penge: %d"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-#, fuzzy
-msgid "Quit Guild"
-msgstr "Klaner"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Partikel effekter"
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Partikel Detalje"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Omgivende FX"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Udstyr"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Tag af"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Luk"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventarliste"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Smid"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 #, fuzzy
 msgid "Slots:"
 msgstr " g Pladser: "
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 #, fuzzy
 msgid "Weight:"
 msgstr "Vægt: "
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr ""
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Smid"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "OK"
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange genstande du vil smide."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 #, fuzzy
 msgid "Select amount of items to store."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 #, fuzzy
 msgid "Select amount of items to retrieve."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Vælg hvor mange genstande du vil opdele."
 
-#: src/gui/itempopup.cpp:91
-#, fuzzy
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "Vægt: "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
+#: src/gui/login.cpp:58
 #, fuzzy
-msgid "Recent:"
-msgstr "Nuværende:"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+msgid "Remember username"
 msgstr "Husk Brugernavn"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Server"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "MiniKort"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Næste"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Opdel"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 #, fuzzy
 msgid "Reset"
 msgstr "Nuværende:"
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Næste"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 #, fuzzy
 msgid "Send"
 msgstr "Lyd"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Tag af"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 #, fuzzy
 msgid "Text"
 msgstr "Næste"
@@ -850,343 +1042,311 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 #, fuzzy
 msgid "Highlight"
 msgstr "høj"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "GM"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "Bruger"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "Hvisk"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "Er"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 #, fuzzy
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+#, fuzzy
+msgid "Guild"
+msgstr "Klaner"
+
+#: src/gui/palette.cpp:103
 #, fuzzy
 msgid "Server"
 msgstr "Server"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "Logger"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "Hyperlink"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 #, fuzzy
 msgid "Own Name"
 msgstr "Navn:"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 #, fuzzy
 msgid "GM Names"
 msgstr "Navn:"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 #, fuzzy
 msgid "NPCs"
 msgstr "NPC"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 #, fuzzy
 msgid "Unknown Item Type"
 msgstr "Ukendt genstand"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Status"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Brug"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 #, fuzzy
 msgid "Shirts"
 msgstr "Genvej"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 #, fuzzy
 msgid "Pants"
 msgstr "Status"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 #, fuzzy
 msgid "Shoes"
 msgstr "Butik"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Sælg"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 #, fuzzy
 msgid "Particle Effects"
 msgstr "Partikel effekter"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 #, fuzzy
 msgid "Critical Hit"
 msgstr "Helbred"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 #, fuzzy
 msgid "Misses"
 msgstr "Besked"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, fuzzy, c-format
-msgid "Party (%s)"
-msgstr "Gruppe"
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, fuzzy, c-format
-msgid "%s has invited you to join their party."
-msgstr "Kunne ikke tilslutte sig gruppen!"
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
-
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
-msgid "Rejected invite from %s."
-msgstr "Blev smidt af serveren!"
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
+msgid "Trade with %s..."
+msgstr "Handel med "
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, fuzzy, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Byt Med "
+msgid "Attack %s"
+msgstr "Angrib %+d"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:92
 #, fuzzy, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Angrib "
+msgid "Whisper %s"
+msgstr "Hvisk"
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:101
 #, fuzzy, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Befriend %s"
 msgstr "@@friend|Bliv ven med "
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:106
 #, fuzzy, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|Se bort fra "
+msgid "Disregard %s"
+msgstr "Se bort fra"
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:109
 #, fuzzy, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore|Bloker "
+msgid "Ignore %s"
+msgstr "Ignorer"
 
-#: 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:115 src/gui/popupmenu.cpp:124
+#, c-format
+msgid "Unignore %s"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:118
 #, fuzzy, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Completely ignore %s"
 msgstr "@@ignore|Bloker fuldstændig "
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
+#, c-format
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
 #, fuzzy, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Invite %s to join your guild"
 msgstr "@@party|Inviter %s med i dit party@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Inviter %s med i dit party@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:144
+#, fuzzy
+msgid "Kick player"
+msgstr "Sæt dig fejlede!"
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, fuzzy, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr "@@talk|Snak Til NPC@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "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:174
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@pickup|Saml Op %s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-#, fuzzy
-msgid "@@use|Unequip@@"
-msgstr "@@use|Tag af@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Tag på@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Brug@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Smid@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Opdel@@"
-
-#: src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
 #, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@ignore|Bloker "
+msgid "Store"
+msgstr "Stop"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Skift server"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Skift karakter"
 
@@ -1206,146 +1366,192 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 #, fuzzy
 msgid "Failed to start recording."
 msgstr "Fejlede i at skifte til "
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 #, fuzzy
 msgid "Recording..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Bekræft:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "E-mail:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Brugernavnet skal mindst være %d bogstaver langt."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Adgangskoden skal mindst være %d bogstaver langt."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
-#: src/gui/serverdialog.cpp:74
+#: src/gui/serverdialog.cpp:134
 #, fuzzy
-msgid "Choose your server"
+msgid "Choose Your Server"
 msgstr "Vælg din Mana World Server"
 
-#: src/gui/serverdialog.cpp:164
-msgid "Please type both the address and the port of a server."
-msgstr "Skriv både adressen og porten på serveren."
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
 
-#: src/gui/serverselectdialog.cpp:59
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
 #, fuzzy
-msgid "Select Server"
-msgstr "Vælg Server"
+msgid "Server type:"
+msgstr "Server:"
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Opsætning"
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Opretter forbindelse..."
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Anvend"
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Brugerdefineret Musepil"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Nulstil Vinduer"
+#: src/gui/serverdialog.cpp:262
+msgid "Please type both the address and the port of a server."
+msgstr "Skriv både adressen og porten på serveren."
+
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Opretter forbindelse til bane serveren..."
+
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Lydstyrke på effekter"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Næste"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 #, fuzzy
 msgid "Colors"
 msgstr "Farver:"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 #, fuzzy
 msgid "Static"
 msgstr "Status"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 #, fuzzy
 msgid "Pulse"
 msgstr "Brug"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 #, fuzzy
 msgid "Spectrum"
 msgstr "Opsætning"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
-msgstr ""
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
+msgstr "Spil"
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:122
 #, fuzzy
-msgid "Green: "
+msgid "Green:"
 msgstr "Til stede: "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Anvend"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Nulstil Vinduer"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
@@ -1387,459 +1593,629 @@ msgstr "Standart"
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 #, fuzzy
 msgid "Name"
 msgstr "Navn:"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Ven"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "Se bort fra"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Ignorer"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Tillad handel"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "Vis navn"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Brugere"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "Når ignorer:"
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Sælg"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 #, fuzzy
 msgid "Medium"
 msgstr "mellem"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 #, fuzzy
 msgid "No text"
 msgstr "Næste"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 #, fuzzy
 msgid "Bubbles, no names"
 msgstr "Synlige navne"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "fra"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "lav"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "høj"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "mellem"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "maks"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Brugerdefineret Musepil"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Synlige navne"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "Partikel effekter"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+#, fuzzy
+msgid "Show own name"
 msgstr "Vis navn"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 #, fuzzy
 msgid "in chat"
 msgstr "inc"
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS grænse:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "Vis navn"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Gennemsigtighed"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Omgivende FX"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "Partikel Detalje"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "Fejlede i at skifte til "
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "vinduet"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Nej"
 
-#: src/gui/setup_video.cpp:357
+#: src/gui/setup_video.cpp:381
 #, fuzzy
-msgid "fullscreen"
-msgstr "Fuld Skærm"
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Skifter til fuld skærm"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Skrifter til OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "Skærm opløsning ændret"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:467
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_video.cpp:522
 #, fuzzy
-msgid "Particle effect settings changed."
+msgid "Particle Effect Settings Changed."
 msgstr "Partikel effekt opsætningen er ændret"
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:523
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr ""
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: 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:149
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "Op"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Færdigheds points: %d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Færdigheds points: %d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Færdigheder"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Niveau: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Niveau: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:146
 #, fuzzy
-msgid "Crafts"
+msgid "Leave Guild?"
 msgstr "Opret"
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:147
 #, fuzzy, c-format
-msgid "Job: %d"
-msgstr "Karriere: %d"
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Er du sikker på at du gerne vil stoppe?"
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "@@party|Inviter %s med i dit party@@"
+
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "@@party|Inviter %s med i dit party@@"
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:69
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Er du sikker på at du gerne vil stoppe?"
+
+#: src/gui/socialwindow.cpp:239
 #, fuzzy
-msgid "Job:"
-msgstr "Karriere: %d"
+msgid "Create Guild"
+msgstr "Opret"
 
-#: src/gui/status.cpp:77
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
 #, fuzzy
-msgid "Stats"
-msgstr "Status"
+msgid "Create Party"
+msgstr "Lav Bruger"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Total"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Pris"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
+msgstr ""
 
-#: src/gui/status.cpp:83
-#, fuzzy
-msgid "Attack:"
-msgstr "Angrib:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
+msgstr ""
 
-#: src/gui/status.cpp:84
-#, fuzzy
-msgid "Defense:"
-msgstr "Forsvar:"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Blev smidt af serveren!"
 
-#: src/gui/status.cpp:85
-#, fuzzy
-msgid "M.Attack:"
-msgstr "M.Angrib:"
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Blev smidt af serveren!"
 
-#: src/gui/status.cpp:86
-#, fuzzy
-msgid "M.Defense:"
-msgstr "M.Forsvar:"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Blev smidt af serveren!"
 
-#: src/gui/status.cpp:88
-#, fuzzy, no-c-format
-msgid "% Accuracy:"
-msgstr "% Nøjagtighed:"
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Blev smidt af serveren!"
 
-#: src/gui/status.cpp:90
-#, fuzzy, no-c-format
-msgid "% Evade:"
-msgstr "% Undvig:"
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% Refleks:"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:198
+#: src/gui/socialwindow.cpp:484
 #, fuzzy
-msgid "Strength"
-msgstr "Styrke"
+msgid "Guild Name"
+msgstr "Klaner"
 
-#: src/gui/status.cpp:199
+#: src/gui/socialwindow.cpp:485
 #, fuzzy
-msgid "Agility"
-msgstr "Adræthed"
+msgid "Choose your guild's name."
+msgstr "Vælg din Mana World Server"
+
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: src/gui/status.cpp:200
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "Kunne ikke tilslutte sig gruppen!"
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
 #, fuzzy
-msgid "Vitality"
-msgstr "Helbred"
+msgid "You have been invited you to join a party."
+msgstr "Kunne ikke tilslutte sig gruppen!"
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/gui/status.cpp:201
+#: src/gui/socialwindow.cpp:541
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "Kunne ikke tilslutte sig gruppen!"
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
 #, fuzzy
-msgid "Intelligence"
-msgstr "Intelligens"
+msgid "Party Name"
+msgstr "Gruppe"
 
-#: src/gui/status.cpp:202
+#: src/gui/socialwindow.cpp:571
 #, fuzzy
-msgid "Dexterity"
-msgstr "Behændighed"
+msgid "Choose your party's name."
+msgstr "Vælg din Mana World Server"
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Held"
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "Tilgode Status Points: %d"
+msgid "Level: %d"
+msgstr "Niveau: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, fuzzy, c-format
+msgid "Money: %s"
+msgstr "Penge: %d"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
 
-#: src/gui/status.cpp:384
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, fuzzy, c-format
+msgid "Job: %d"
+msgstr "Karriere: %d"
+
+#: src/gui/statuswindow.cpp:133
 #, fuzzy
-msgid "Max level"
-msgstr "Mand"
+msgid "Job:"
+msgstr "Karriere: %d"
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
+#: src/gui/statuswindow.cpp:215
 #, fuzzy
-msgid "Store"
-msgstr "Stop"
+msgid "Money"
+msgstr "Penge: %d"
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "Karriere: %d"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Du har brugt alle dine points"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Færdigheds points: %d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Niveau: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Foreslå handel"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 #, fuzzy
 msgid "Confirmed. Waiting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 #, fuzzy
 msgid "Agree trade"
 msgstr "Foreslå handel"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 #, fuzzy
 msgid "Agreed. Waiting..."
 msgstr "Updatere..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, fuzzy, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr "Du får %d GP."
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Ændre"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
 "vinduet."
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 #, fuzzy
 msgid "You don't have enough money."
 msgstr "Du har ingen memorandaer!"
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Navn: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Updatere..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Opretter forbindelse..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Spil"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "curl fejl "
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " host: "
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "##1  du prøver igen senere"
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Udført"
 
@@ -1897,708 +2273,780 @@ msgstr "Denne kommando viser det nuværende bane navn."
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 #, fuzzy
 msgid "Command: /op <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 #, fuzzy
 msgid "Command: /kick <nick>"
 msgstr "Kommando: /w <navn> <besked>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 #, fuzzy
 msgid "Global announcement:"
 msgstr "Global meddelelse: "
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, fuzzy, c-format
 msgid "Global announcement from %s:"
 msgstr "Global meddelelse fra "
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, fuzzy, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr "Tillad hviskere"
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 #, fuzzy
 msgid "Cannot send empty chat!"
 msgstr "Kan ikke råbe!"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 #, fuzzy
 msgid "Command: /close"
 msgstr "Kommando: /clear"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 #, fuzzy
 msgid "This command closes the current whisper tab."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Status"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Kommando: /toggle"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Klaner"
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+"Denne kommando viser det antal af online brugere, der nuværende er online."
 
-#: src/gui/windowmenu.cpp:66
+#: src/gui/widgets/whispertab.cpp:94
 #, fuzzy
-msgid "Buddys"
-msgstr "Køb"
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Denne commando rydder chat loggen"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Genvej"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Vælg Server"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Ændre"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Vælg din Mana World Server"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 #, fuzzy
 msgid "Attack"
 msgstr "Angrib:"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 #, fuzzy
 msgid "Target & Attack"
 msgstr "Angrib:"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 #, fuzzy
 msgid "Talk"
 msgstr "Total"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 #, fuzzy
 msgid "Stop Attack"
 msgstr "Angrib:"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
-msgstr ""
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
+msgstr "Bruger"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 #, fuzzy
 msgid "Target Player"
 msgstr "Bruger"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 #, fuzzy
 msgid "Hide Windows"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 #, fuzzy
 msgid "Sit"
 msgstr "Opdel"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 #, fuzzy
 msgid "Screenshot"
 msgstr "Skærmbillede gemt under ~/"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, fuzzy, c-format
 msgid "Item Shortcut %d"
 msgstr "Genvej"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 #, fuzzy
 msgid "Help Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 #, fuzzy
 msgid "Status Window"
 msgstr "Status"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 #, fuzzy
 msgid "Inventory Window"
 msgstr "Inventarliste"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Udstyr"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 #, fuzzy
 msgid "Skill Window"
 msgstr "Færdigheds points: %d"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 #, fuzzy
 msgid "Chat Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 #, fuzzy
 msgid "Setup Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 #, fuzzy
 msgid "Debug Window"
 msgstr "Nulstil Vinduer"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
-msgstr "Nulstil Vinduer"
+msgid "Social Window"
+msgstr "Færdigheds points: %d"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Status"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, fuzzy, c-format
 msgid "Emote Shortcut %d"
 msgstr "Genvej"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 #, fuzzy
 msgid "Previous Chat Tab"
 msgstr "Forrige"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 #, fuzzy
 msgid "Select OK"
 msgstr "Vælg Server"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-#, fuzzy
-msgid "Unarmed"
-msgstr "Unavngivet"
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-#, fuzzy
-msgid "Sword"
-msgstr "Lyd"
-
-#: src/localplayer.cpp:763
-#, fuzzy
-msgid "Polearm"
-msgstr "Bruger"
-
-#: src/localplayer.cpp:764
-#, fuzzy
-msgid "Staff"
-msgstr "Status"
-
-#: src/localplayer.cpp:765
-#, fuzzy
-msgid "Whip"
-msgstr "Hvisk"
-
-#: src/localplayer.cpp:766
-#, fuzzy
-msgid "Bow"
-msgstr "lav"
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-#, fuzzy
-msgid "Mace"
-msgstr "Mand"
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-#, fuzzy
-msgid "Craft"
-msgstr "Opret"
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 
-#: src/localplayer.cpp:773
+#: src/localplayer.cpp:913
 #, fuzzy
-msgid "Unknown Skill"
-msgstr "Ukendt genstand"
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr "Ugyldigt opdaterings host: "
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr "Fejl under oprettelsen af opdateringen mappen!"
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr " kan ikke laves, men det findes ikke! Lukker."
-
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "Kunne ikke definere "
+msgid "Unable to pick up item."
+msgstr "Kunne ikke skabe mThread"
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr " skærm opsætning: "
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Du samlede op "
+msgstr[1] "Du samlede op "
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 #, fuzzy
 msgid "Options:"
 msgstr "Opsætning: "
 
-#: src/main.cpp:577
+#: src/main.cpp:45
 #, fuzzy
-msgid "  -C --config-file : Configuration file to use"
-msgstr "  -C --configfile : Configurations fil til brug"
-
-#: src/main.cpp:578
-#, fuzzy
-msgid "  -d --data        : Directory to load game data from"
-msgstr "  -d --data       : Mappen at indlæse spillets data fra"
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr ""
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version    : Viser den nuværende version"
 
-#: src/main.cpp:581
+#: src/main.cpp:46
 #, fuzzy
-msgid "  -h --help        : Display this help"
+msgid "  -h --help           : Display this help"
 msgstr "  -h --help       : Viser denne hjælp"
 
-#: src/main.cpp:582
+#: src/main.cpp:47
 #, fuzzy
-msgid "  -S --home-dir    : Directory to use as home directory"
-msgstr "  -d --data       : Mappen at indlæse spillets data fra"
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --configfile : Configurations fil til brug"
 
-#: src/main.cpp:583
+#: src/main.cpp:48
 #, fuzzy
-msgid "  -H --update-host : Use this update host"
-msgstr "  -H --updatehost : Brug denne opdaterings host"
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: src/main.cpp:584
+#: src/main.cpp:49
 #, fuzzy
-msgid "  -P --password    : Login with this password"
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password   : Logind med denne adgangskode"
 
-#: src/main.cpp:585
+#: src/main.cpp:50
 #, fuzzy
-msgid "  -c --character   : Login with this character"
+msgid "  -c --character      : Login with this character"
 msgstr "  -p --playername : Logind med denne bruger"
 
-#: src/main.cpp:586
+#: src/main.cpp:51
 #, fuzzy
-msgid "  -p --port        : Login server port"
+msgid "  -s --server         : Login server name or IP"
 msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: src/main.cpp:587
+#: src/main.cpp:52
 #, fuzzy
-msgid "  -s --server      : Login server name or IP"
+msgid "  -p --port           : Login server port"
 msgstr "  -U --username   : Logind med dette brugernavn"
 
-#: src/main.cpp:588
+#: src/main.cpp:53
 #, fuzzy
-msgid "  -u --skip-update : Skip the update downloads"
-msgstr "  -u --skipupdate : Spring opdateringerne over"
-
-#: src/main.cpp:589
-#, fuzzy
-msgid "  -U --username    : Login with this username"
-msgstr "  -U --username   : Logind med dette brugernavn"
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --updatehost : Brug denne opdaterings host"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:593
+#: src/main.cpp:56
 #, fuzzy
-msgid "  -v --version     : Display the version"
-msgstr "  -v --version    : Viser den nuværende version"
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skipupdate : Spring opdateringerne over"
 
-#: src/main.cpp:1528
+#: src/main.cpp:57
 #, fuzzy
-msgid "Connecting to map server..."
-msgstr "Opretter forbindelse til bane serveren..."
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data       : Mappen at indlæse spillets data fra"
+
+#: src/main.cpp:58
+#, fuzzy
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -d --data       : Mappen at indlæse spillets data fra"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "Opretter forbindelse til karakter serveren..."
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -d --data       : Mappen at indlæse spillets data fra"
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Opretter forbindelse til bruger serveren..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 #, fuzzy
 msgid "Kick failed!"
 msgstr "Sæt dig fejlede!"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 #, fuzzy
 msgid "Nothing to sell."
 msgstr "Kan ikke loade valgte-billede.png"
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 #, fuzzy
 msgid "Unable to buy."
 msgstr "Tag af"
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 #, fuzzy
 msgid "Unable to sell."
 msgstr "Kan ikke loade valgte-billede.png"
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
-msgstr ""
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Kan ikke råbe!"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
-msgstr ""
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown failure to select character."
+msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 #, fuzzy
 msgid "Info"
 msgstr "nej"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Bekræft sletning af karakter"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 #, fuzzy
 msgid "Failed to delete character."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 #, fuzzy
 msgid "Strength:"
 msgstr "Styrke"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 #, fuzzy
 msgid "Agility:"
 msgstr "Adræthed"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 #, fuzzy
 msgid "Vitality:"
 msgstr "Helbred"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 #, fuzzy
 msgid "Intelligence:"
 msgstr "Intelligens"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 #, fuzzy
 msgid "Dexterity:"
 msgstr "Behændighed"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 #, fuzzy
 msgid "Luck:"
 msgstr "Held"
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Bruger"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:100
 #, fuzzy
-msgid "Unable to equip."
-msgstr "Tag af"
+msgid "Game"
+msgstr "Navn:"
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr ""
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Ansøg om lov til at handle"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Styrke"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Adræthed"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Helbred"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Behændighed"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Held"
 
-#: src/net/ea/generalhandler.cpp:118
+#: src/net/ea/generalhandler.cpp:130
 #, fuzzy
-msgid "Authentication failed"
+msgid "Authentication failed."
 msgstr "Chat skabelsen fejlede!"
 
-#: src/net/ea/generalhandler.cpp:121
+#: src/net/ea/generalhandler.cpp:133
 #, fuzzy
-msgid "No servers available"
+msgid "No servers available."
 msgstr "Ingen opsætning tilgængelig"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
+msgstr "Ukendt genstand"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+#, fuzzy
+msgid "Strength"
+msgstr "Styrke"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+#, fuzzy
+msgid "Agility"
+msgstr "Adræthed"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+#, fuzzy
+msgid "Vitality"
+msgstr "Helbred"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+#, fuzzy
+msgid "Intelligence"
+msgstr "Intelligens"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+#, fuzzy
+msgid "Dexterity"
+msgstr "Behændighed"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Held"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Forsvar:"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "M.Angrib:"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "M.Forsvar:"
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Nøjagtighed:"
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Undvig:"
+
+#: src/net/ea/generalhandler.cpp:229
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Helbred"
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 #, fuzzy
 msgid "/help > Display this help."
 msgstr "/help: Viser denne hjælp"
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "@@party|Inviter %s med i dit party@@"
+
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#, fuzzy
+msgid "Command: /invite <nick>"
+msgstr "Kommando: /w <navn> <besked>"
+
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#, fuzzy
+msgid "Command: /leave"
+msgstr "Kommando: /clear"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Denne kommando viser fokusering af chat vinduets status."
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-#, fuzzy
-msgid "Command: /new <party-name>"
-msgstr "Kommando /toggle <tilstand>"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-#, fuzzy
-msgid "Command: /create <party-name>"
-msgstr "Kommando /toggle <tilstand>"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-#, fuzzy
-msgid "Command: /invite <nick>"
-msgstr "Kommando: /w <navn> <besked>"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-#, fuzzy
-msgid "Command: /leave"
-msgstr "Kommando: /clear"
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 #, fuzzy
 msgid "This command causes the player to leave the party."
 msgstr "Denne kommando viser fokusering af chat vinduets status."
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 #, fuzzy
 msgid "Command: /item <policy>"
 msgstr "Kommando: /toggle"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 #, fuzzy
 msgid "This command changes the party's item sharing policy."
 msgstr "Denne kommando sender beskeden <besked> til <navn>."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 #, fuzzy
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
@@ -2608,26 +3056,26 @@ msgstr ""
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 #, fuzzy
 msgid "Command: /item"
 msgstr "Kommando: /toggle"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 #, fuzzy
 msgid "This command displays the party's current item sharing policy."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 #, fuzzy
 msgid "Command: /exp <policy>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 #, fuzzy
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
@@ -2637,201 +3085,218 @@ msgstr ""
 "af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
 "chat vindue fra."
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 #, fuzzy
 msgid "Command: /exp"
 msgstr "Kommando: /help"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 #, fuzzy
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Denne kommando viser det nuværende bane navn."
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-#, fuzzy
-msgid "Unable to pick up item."
-msgstr "Kunne ikke skabe mThread"
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, fuzzy, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "Du samlede op "
-
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:281
 #, fuzzy
 msgid "Failed to use item."
 msgstr "Fejlede i at skifte til "
 
-#: src/net/ea/loginhandler.cpp:76
-msgid "Account was not found. Please re-login."
+#: src/net/ea/inventoryhandler.cpp:391
+#, fuzzy
+msgid "Unable to equip."
+msgstr "Tag af"
+
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:79
+msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Skift e-mail adresse"
+
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 #, fuzzy
-msgid "Unknown error"
+msgid "Unknown error."
 msgstr "Ukendt genstand"
 
-#: src/net/ea/loginhandler.cpp:142
+#: src/net/ea/loginhandler.cpp:149
 #, fuzzy
-msgid "Unregistered ID"
+msgid "Unregistered ID."
 msgstr "Frameld"
 
-#: src/net/ea/loginhandler.cpp:145
+#: src/net/ea/loginhandler.cpp:152
 #, fuzzy
-msgid "Wrong password"
+msgid "Wrong password."
 msgstr "Skift adgangskode"
 
-#: src/net/ea/loginhandler.cpp:148
+#: src/net/ea/loginhandler.cpp:155
 #, fuzzy
-msgid "Account expired"
+msgid "Account expired."
 msgstr "Bruger: %s"
 
-#: src/net/ea/loginhandler.cpp:151
+#: src/net/ea/loginhandler.cpp:158
 #, fuzzy
-msgid "Rejected from server"
+msgid "Rejected from server."
 msgstr "Blev smidt af serveren!"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Brugernavn er %s"
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "Kan ikke loade valgte-billede.png"
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Opretter forbindelse til bane serveren..."
+
+#: src/net/ea/partyhandler.cpp:81
 #, fuzzy
 msgid "Could not create party."
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 #, fuzzy
 msgid "You have left the party."
 msgstr "Du er holdt op med at være til."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, fuzzy, c-format
 msgid "%s is not in your party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "Du er død."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Vi er ked af at måtte informere dig, om at din karakter var dræbt i kamp."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "Du er ikke så levende som du engang har været."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "De kolder hænder der tilhøre Grim Reaper, griber ud efter din sjæl"
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 #, fuzzy
 msgid "Insert coin to continue."
 msgstr "Indsæt en mønt for at fortsætte"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2839,384 +3304,537 @@ msgstr ""
 "Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
 "sted."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "Jeg går ud fra at dette ikke gik alt for godt."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "Du vil gerne have dine ejendele identificeret?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "Udslettet."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "Det ser ud til at du fik du hoved udleveret til dig."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "Du er ikke død endnu. Du hviler dig bare."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "Du er ikke mere."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "Du er holdt op med at være til."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "Du er udløbet og er gået hen for at møde din skaber."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "Du er en hård nød at knække, men desværre død."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
 "Norris."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "Din tid er ovre."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr "Drik noget syre."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "Du har stillet træskoene."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Du har spist af dødens pølse for den sidste gang."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "Du er en forhenværende spiller."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 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:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "Besked"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 #, fuzzy
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Du bære på mere en halvdelen af din vægt. Du kan derfor ikke genvinde liv."
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "Du samlede op "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 #, fuzzy
 msgid "Equip arrows first."
 msgstr "Tag først pile på"
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Handel fejlede!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Emote fejlede!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Sæt dig fejlede!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Chat skabelsen fejlede!"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Kunne ikke tilslutte sig gruppen!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Kan ikke råbe!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 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:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "Utilstrækkelig HP!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "Utilstrækkelig SP!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Du har ingen memorandaer!"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Det kan du ikke gøre lige nu!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 #, fuzzy
 msgid "Seems you need more money... ;-)"
 msgstr "Det ser ud til at du har behov for flere Zeny... ;-)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Du har behov for en rød krystal mere"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Du har behov for en blå krystal mere"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 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:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "Hmm? Hvad er det?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "Warp mislykkede..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Kunne ikke stjæle noget som helst..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Giften havde ingen effekt..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 #, fuzzy
 msgid "Request for Trade"
 msgstr "Ansøg om lov til at handle"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, fuzzy, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr " vil gerne handle med dig, vil du acceptere?"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 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:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Du kan ikke handle. Karakteren findes ikke."
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handlen blev annulleret af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, fuzzy, c-format
 msgid "Trade: You and %s"
 msgstr "Handel: Dig og "
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, fuzzy, c-format
 msgid "Trade with %s cancelled."
 msgstr "Handel annulleret."
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 #, fuzzy
 msgid "Unhandled trade cancel packet."
 msgstr "Ubehandlet handel annullerede pakken"
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 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:203
+#: src/net/ea/tradehandler.cpp:207
 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:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Fejlede i at tilføje genstand af en ukendt grund."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "Handel annulleret."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "Handel er komplet."
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
+#: src/net/manaserv/beinghandler.cpp:325
 #, fuzzy
-msgid "You died"
+msgid "You Died"
 msgstr "Du giver:"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Brugernavn er %s"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Du har brugt alle dine points"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Du har brugt alle dine points"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Bruger"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Vælg hvor mange genstande du vil bytte."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Ukendt genstand"
+
+#: src/net/manaserv/charhandler.cpp:242
 #, fuzzy
 msgid "No gameservers are available."
 msgstr "Ingen opsætning tilgængelig"
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Viljestyrke:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Kommando: /help"
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Ukendt kommando"
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Viljestyrke:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Viljestyrke:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 #, fuzzy
 msgid "Failed to promote member."
 msgstr "Fejlede i at skifte til "
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 #, fuzzy
-msgid "Server is full"
+msgid "Server is full."
 msgstr "Server"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
-msgstr ""
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
+msgstr "Skift e-mail adresse"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
+#: src/net/manaserv/loginhandler.cpp:149
 #, fuzzy
-msgid "New email address incorrect"
+msgid "New email address incorrect."
 msgstr "Skift e-mail adresse"
 
-#: src/net/manaserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:152
 #, fuzzy
-msgid "Old email address incorrect"
+msgid "Old email address incorrect."
 msgstr "Skift e-mail adresse"
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:158
 #, fuzzy
-msgid "The new Email Address already exists."
+msgid "The new email address already exists."
 msgstr "Skift e-mail adresse"
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
+#: src/net/manaserv/loginhandler.cpp:266
 #, fuzzy
-msgid "Wrong username or password"
+msgid "Wrong username or password."
 msgstr "Skift adgangskode"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
+#: src/net/manaserv/loginhandler.cpp:303
 #, fuzzy
-msgid "Username already exists"
+msgid "Wrong username, password or email address."
+msgstr "Skift adgangskode"
+
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "Brugernavn er %s"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
+msgstr "Skift e-mail adresse"
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "Blev smidt af serveren!"
+
+#: src/net/manaserv/tradehandler.cpp:96
 #, fuzzy
 msgid "Accepting incoming trade requests."
 msgstr "Accepter indkomne handels anmodninger"
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 #, fuzzy
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorer indkomne handels anmodninger"
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, fuzzy, c-format
 msgid "Trading with %s"
 msgstr "Handel med "
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Bloker fuldstændig "
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3237,25 +3855,213 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "Unavngivet"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "unavngivet"
 
+#~ msgid "no"
+#~ msgstr "nej"
+
+#, fuzzy
+#~ msgid "Buddy"
+#~ msgstr "Køb"
+
+#~ msgid "Description: %s"
+#~ msgstr "Beskrivelse: %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Effekt: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Forrige"
+
+#~ msgid "New"
+#~ msgstr "Opret"
+
+#, fuzzy
+#~ msgid "Job Level: %d"
+#~ msgstr "Niveau: %d"
+
+#~ msgid "Present: "
+#~ msgstr "Til stede: "
+
+#, fuzzy
+#~ msgid "Quit Guild"
+#~ msgstr "Klaner"
+
+#, fuzzy
+#~ msgid "Recent:"
+#~ msgstr "Nuværende:"
+
+#, fuzzy
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Byt Med "
+
+#, fuzzy
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Angrib "
+
+#, fuzzy
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Se bort fra "
+
+#, fuzzy
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Bloker "
+
+#, fuzzy
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Fjern blokering "
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuller@@"
+
+#, fuzzy
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Tag af@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Tag på@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Brug@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Smid@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Opdel@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@ignore|Bloker "
+
+#, fuzzy
+#~ msgid "Select Server"
+#~ msgstr "Vælg Server"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "Fejlede i at skifte til "
+
+#~ msgid "windowed"
+#~ msgstr "vinduet"
+
+#, fuzzy
+#~ msgid "fullscreen"
+#~ msgstr "Fuld Skærm"
+
+#, fuzzy
+#~ msgid "Crafts"
+#~ msgstr "Opret"
+
+#, fuzzy
+#~ msgid "Stats"
+#~ msgstr "Status"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Cost"
+#~ msgstr "Pris"
+
+#, fuzzy
+#~ msgid "Attack:"
+#~ msgstr "Angrib:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Refleks:"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Tilgode Status Points: %d"
+
+#, fuzzy
+#~ msgid "Max level"
+#~ msgstr "Mand"
+
+#~ msgid "curl error "
+#~ msgstr "curl fejl "
+
+#~ msgid " host: "
+#~ msgstr " host: "
+
+#~ msgid "Guilds"
+#~ msgstr "Klaner"
+
+#, fuzzy
+#~ msgid "Buddys"
+#~ msgstr "Køb"
+
+#, fuzzy
+#~ msgid "Party Window"
+#~ msgstr "Nulstil Vinduer"
+
+#, fuzzy
+#~ msgid "Unarmed"
+#~ msgstr "Unavngivet"
+
+#, fuzzy
+#~ msgid "Sword"
+#~ msgstr "Lyd"
+
+#, fuzzy
+#~ msgid "Polearm"
+#~ msgstr "Bruger"
+
+#, fuzzy
+#~ msgid "Staff"
+#~ msgstr "Status"
+
+#, fuzzy
+#~ msgid "Whip"
+#~ msgstr "Hvisk"
+
+#, fuzzy
+#~ msgid "Bow"
+#~ msgstr "lav"
+
+#, fuzzy
+#~ msgid "Mace"
+#~ msgstr "Mand"
+
+#, fuzzy
+#~ msgid "Craft"
+#~ msgstr "Opret"
+
+#, fuzzy
+#~ msgid "Unknown Skill"
+#~ msgstr "Ukendt genstand"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " kan ikke laves, men det findes ikke! Lukker."
+
+#~ msgid "Couldn't set "
+#~ msgstr "Kunne ikke definere "
+
+#~ msgid " video mode: "
+#~ msgstr " skærm opsætning: "
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "Opretter forbindelse til karakter serveren..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Opretter forbindelse til bruger serveren..."
+
+#, fuzzy
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Kommando /toggle <tilstand>"
+
+#~ msgid "Unnamed"
+#~ msgstr "Unavngivet"
+
 #, fuzzy
 #~ msgid "The Mana World %s"
 #~ msgstr "Vælg din Mana World Server"
 
-#~ msgid "Select Character"
-#~ msgstr "Vælg Karakter"
-
 #~ msgid "Unable to load selection.png"
 #~ msgstr "Kan ikke loade valgte-billede.png"
 
@@ -3268,10 +4074,6 @@ msgstr "unavngivet"
 #~ msgstr " g Pladser: "
 
 #, fuzzy
-#~ msgid "Player deleted"
-#~ msgstr "Bruger"
-
-#, fuzzy
 #~ msgid " cancelled"
 #~ msgstr " afbrudt"
 
diff --git a/po/de.po b/po/de.po
index b3cc3ccb..46be4e61 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,61 +5,11 @@
 # Matthias Hartmann <hartmann.matthias@gmail.com>, 2007.
 # Jonathan Raphael Joachim Kolberg, 2009, 2010.
 # seeseekey <seeseekey@googlemail.com>, 2009.
-#: src/commandhandler.cpp:149 src/commandhandler.cpp:319
-#: src/commandhandler.cpp:320 src/commandhandler.cpp:344
-#: src/commandhandler.cpp:397 src/engine.cpp:50 src/engine.cpp:57
-#: src/engine.cpp:106 src/engine.cpp:107 src/game.cpp:141 src/game.cpp:389
-#: src/game.cpp:390 src/gui/buy.cpp:68 src/gui/buy.cpp:79 src/gui/buy.cpp:80
-#: src/gui/buy.cpp:247 src/gui/buy.cpp:248 src/gui/charcreatedialog.cpp:67
-#: src/gui/chat.cpp:197 src/gui/chat.cpp:279 src/gui/chat.cpp:307
-#: src/gui/chat.cpp:309 src/gui/chat.cpp:380 src/gui/chat.cpp:384
-#: src/gui/chat.cpp:386 src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:66
-#: src/gui/debugwindow.cpp:67 src/gui/itemamount.cpp:69
-#: src/gui/npcdialog.cpp:85 src/gui/npcdialog.cpp:93 src/gui/npcdialog.cpp:172
-#: src/gui/npcpostdialog.cpp:105 src/gui/npcpostdialog.cpp:106
-#: src/gui/outfitwindow.cpp:129 src/gui/palette.cpp:217
-#: src/gui/partywindow.cpp:176 src/gui/partywindow.cpp:211
-#: src/gui/partywindow.cpp:218 src/gui/recorder.cpp:119
-#: src/gui/register.cpp:212 src/gui/register.cpp:213 src/gui/sell.cpp:70
-#: src/gui/sell.cpp:77 src/gui/sell.cpp:78 src/gui/sell.cpp:266
-#: src/gui/sell.cpp:267 src/gui/serverdialog.cpp:101
-#: src/gui/serverdialog.cpp:107 src/gui/serverdialog.cpp:219
-#: src/gui/setup_colors.cpp:177 src/gui/setup_players.cpp:81
-#: src/gui/setup_video.cpp:146 src/gui/setup_video.cpp:160
-#: src/gui/setup_video.cpp:175 src/gui/setup_video.cpp:209
-#: src/gui/setup_video.cpp:216 src/gui/setup_video.cpp:219
-#: src/gui/setup_video.cpp:573 src/gui/skilldialog.cpp:107
-#: src/gui/skilldialog.cpp:205 src/gui/specialswindow.cpp:104
-#: src/gui/specialswindow.cpp:191 src/gui/statuswindow.cpp:100
-#: src/gui/statuswindow.cpp:263 src/gui/trade.cpp:79 src/gui/trade.cpp:100
-#: src/gui/trade.cpp:182 src/gui/trade.cpp:236 src/gui/trade.cpp:244
-#: src/gui/updatewindow.cpp:70 src/gui/updatewindow.cpp:71
-#: src/gui/updatewindow.cpp:73 src/gui/updatewindow.cpp:107
-#: src/gui/updatewindow.cpp:398 src/gui/widgets/channeltab.cpp:116
-#: src/gui/widgets/channeltab.cpp:123 src/gui/widgets/chattab.cpp:80
-#: src/gui/widgets/chattab.cpp:141 src/gui/widgets/chattab.cpp:146
-#: src/gui/widgets/chattab.cpp:153 src/gui/widgets/chattab.cpp:161
-#: src/gui/widgets/chattab.cpp:171 src/gui/widgets/chattab.cpp:173
-#: src/main.cpp:675 src/main.cpp:698 src/main.cpp:795 src/main.cpp:1064
-#: src/main.cpp:1159 src/net/ea/chathandler.cpp:122
-#: src/net/ea/partyhandler.cpp:143 src/net/ea/partyhandler.cpp:146
-#: src/net/ea/partyhandler.cpp:320 src/net/manaserv/charhandler.cpp:114
-#: src/net/manaserv/charhandler.cpp:192 src/net/manaserv/chathandler.cpp:188
-#: src/net/manaserv/chathandler.cpp:211 src/net/manaserv/chathandler.cpp:266
-#: src/net/manaserv/chathandler.cpp:340 src/net/manaserv/generalhandler.cpp:67
-#: src/net/manaserv/guildhandler.cpp:131 src/playerrelations.cpp:62
-#: src/playerrelations.cpp:283 src/resources/itemdb.cpp:114
-#: src/resources/itemdb.cpp:147 src/resources/itemdb.cpp:148
-#: src/resources/itemdb.cpp:149 src/resources/itemdb.cpp:150
-#: src/resources/itemdb.cpp:180 src/resources/itemdb.cpp:191
-#: src/resources/itemdb.cpp:228 src/resources/itemdb.cpp:229
-#: src/resources/itemdb.cpp:230 src/resources/itemdb.cpp:306
-#: src/resources/monsterdb.cpp:101 src/resources/monsterdb.cpp:133
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-31 15:55+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -70,355 +20,318 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/commandhandler.cpp:52 src/commandhandler.cpp:184
-#: src/commandhandler.cpp:191 src/gui/widgets/channeltab.cpp:59
-#: src/gui/widgets/whispertab.cpp:77 src/main.cpp:557
-#: src/net/ea/gui/partytab.cpp:67
-msgid "help"
-msgstr "Hilfe"
-
-#: src/commandhandler.cpp:60 src/commandhandler.cpp:195
-msgid "announce"
-msgstr "ankündigen"
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Einstellungen"
 
-#: src/commandhandler.cpp:64 src/commandhandler.cpp:284
-msgid "where"
-msgstr "Wo"
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Verbinde mit [Benutzerdatenserver]..."
 
-#: src/commandhandler.cpp:68 src/commandhandler.cpp:289
-msgid "who"
-msgstr "Wer"
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Anmelden"
 
-#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
-msgid "msg"
+#: src/client.cpp:683
+msgid "Entering game world"
 msgstr ""
 
-#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
-#: src/gui/popupmenu.cpp:227
-msgid "whisper"
-msgstr "geflüsterte Nachricht"
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Spielfigur auswählen"
 
-#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
-msgid "w"
-msgstr ""
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Verbinde mit [Charakterserver]..."
 
-#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
-msgid "query"
-msgstr ""
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Fehler"
 
-#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
-msgid "q"
+#: src/client.cpp:815
+msgid "Requesting registration details"
 msgstr ""
 
-#: src/commandhandler.cpp:80 src/commandhandler.cpp:207
-#: src/gui/popupmenu.cpp:238 src/gui/widgets/whispertab.cpp:84
-#: src/gui/widgets/whispertab.cpp:103
-msgid "ignore"
-msgstr "Ignoriere"
+#: src/client.cpp:842
+msgid "Password Change"
+msgstr "Passwort ändern:"
 
-#: src/commandhandler.cpp:84 src/commandhandler.cpp:278
-#: src/gui/popupmenu.cpp:231 src/gui/widgets/whispertab.cpp:90
-#: src/gui/widgets/whispertab.cpp:107
-msgid "unignore"
-msgstr "nicht ignorieren"
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr "Passwort erfolgreich geändert!"
 
-#: src/commandhandler.cpp:88 src/commandhandler.cpp:213
-#, fuzzy
-msgid "join"
-msgstr "Anmelden"
+#: src/client.cpp:862
+msgid "Email Change"
+msgstr "E-Mail ändern"
 
-#: src/commandhandler.cpp:92 src/commandhandler.cpp:219
+#: src/client.cpp:863
 #, fuzzy
-msgid "list"
-msgstr "Aufteilen"
+msgid "Email changed successfully!"
+msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: src/commandhandler.cpp:96 src/commandhandler.cpp:202
+#: src/client.cpp:883
 #, fuzzy
-msgid "clear"
-msgstr "Waffenarm"
-
-#: src/commandhandler.cpp:100 src/commandhandler.cpp:245
-#: src/gui/popupmenu.cpp:327
-msgid "party"
-msgstr "Party"
+msgid "Unregister Successful"
+msgstr "Abmelden"
 
-#: src/commandhandler.cpp:104 src/commandhandler.cpp:224
-msgid "me"
-msgstr "ich"
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/commandhandler.cpp:108 src/commandhandler.cpp:259
-msgid "record"
-msgstr "nehme auf"
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
 
-#: src/commandhandler.cpp:112 src/commandhandler.cpp:267
-#: src/commandhandler.cpp:435
-#, fuzzy
-msgid "toggle"
-msgstr "Logger"
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "Ungültiger Updateserver: "
 
-#: src/commandhandler.cpp:116 src/commandhandler.cpp:252
-msgid "present"
-msgstr "Anwesend: "
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/commandhandler.cpp:122 src/commandhandler.cpp:297
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:130 src/gui/chat.cpp:110
-#: src/gui/statuswindow.cpp:442
-msgid "1"
-msgstr ""
-
-#: src/commandhandler.cpp:131
-msgid "y"
-msgstr ""
-
-#: src/commandhandler.cpp:131
-msgid "Y"
-msgstr ""
-
-#: src/commandhandler.cpp:132
-msgid "t"
-msgstr ""
-
-#: src/commandhandler.cpp:132
-msgid "T"
-msgstr ""
-
-#: src/commandhandler.cpp:134 src/gui/chat.cpp:110 src/gui/chat.cpp:307
-#: src/gui/chat.cpp:309 src/gui/skilldialog.cpp:95
-#: src/gui/widgets/chattab.cpp:171 src/gui/widgets/chattab.cpp:173
-msgid "0"
-msgstr ""
-
-#: src/commandhandler.cpp:135
-msgid "n"
-msgstr "Nein"
-
-#: src/commandhandler.cpp:135
-msgid "N"
-msgstr "Nein"
-
-#: src/commandhandler.cpp:136
-msgid "f"
-msgstr ""
-
-#: src/commandhandler.cpp:136
-msgid "F"
-msgstr ""
-
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Hilfe --"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > diese Hilfe anzeigen"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Zeige den Namen der aktuellen Karte"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Erzähle etwas über Dich"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Löscht den Inhalt dieses Fensters"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Ersatz für msg"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Ersatz für msg"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:168
 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:164
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > Ersatz für query"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:171
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:172
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Zeige alle öffentlichen Kanäle"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Erstelle eine neue Party"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > Lade einen Benutzer zu deiner Party ein"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:182
 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:178
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr "Für mehr Informationen, gib /help <Befehl> ein."
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Befehl: /help"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Befehl: /help <Befehl>"
 
-#: src/commandhandler.cpp:189
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Befehl: /announce <Nachricht>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** Nur für GMs verfügbar ***"
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:205
 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:204
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Befehl: /clear"
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:215
 msgid "Command: /ignore <player>"
 msgstr "Befehl: /item <Wert>"
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:216
 msgid "This command ignores the given player regardless of current relations."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Befehl: /join <Kanal>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
 
-#: src/commandhandler.cpp:217
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "Befehl: /list"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
 
-#: src/commandhandler.cpp:226
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "Befehl: /me <Nachricht>"
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
 
-#: src/commandhandler.cpp:231
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "Befehl: /msg <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "Befehl: /whisper <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "Befehl: /w <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:234
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
 
-#: src/commandhandler.cpp:235 src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/partytab.cpp:79
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
 "(\")."
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "Befehl: /query <Name>"
 
-#: src/commandhandler.cpp:241
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "Befehl: /q <Name>"
 
-#: src/commandhandler.cpp:242
+#: src/commandhandler.cpp:248
 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:247
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Befehl: /create <Party-Name>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "Befehl: /party <Name>"
 
-#: src/commandhandler.cpp:248 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 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:254
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "Befehl: /present"
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:266
 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."
@@ -427,29 +340,29 @@ msgstr ""
 "sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
 "Chatfenster an."
 
-#: src/commandhandler.cpp:261
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "Befehl: /record <Dateiname>"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:273
 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:264
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "Befehl: /record"
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
 
-#: src/commandhandler.cpp:269
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "Befehl: /toggle <Status>"
 
-#: src/commandhandler.cpp:270
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -458,7 +371,7 @@ msgstr ""
 "eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
 "gedrückt wurde."
 
-#: src/commandhandler.cpp:272
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -466,68 +379,48 @@ msgstr ""
 "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  \"0\","
 "\"no\",\"false\" deaktiviert es."
 
-#: src/commandhandler.cpp:275
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "Befehl: /toggle"
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
 
-#: src/commandhandler.cpp:280 src/gui/widgets/whispertab.cpp:92
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
 #, fuzzy
 msgid "Command: /unignore <player>"
 msgstr "Befehl: /item <Wert>"
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:292
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Befehl: /where"
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Befehl: /who"
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:303
 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:298
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
 
-#: src/commandhandler.cpp:305
-msgid ", coordinates: "
-msgstr ", Koordinaten: "
-
-#: src/commandhandler.cpp:306 src/gui/chat.cpp:289
-msgid ", "
-msgstr ""
-
-#: src/commandhandler.cpp:322 src/net/ea/network.cpp:343
-msgid "\""
-msgstr ""
-
-#: src/commandhandler.cpp:334 src/gui/chat.cpp:405
-#: src/gui/outfitwindow.cpp:125 src/gui/widgets/chattab.cpp:115
-#: src/gui/widgets/chattab.cpp:122 src/gui/widgets/chattab.cpp:136
-#: src/net/ea/specialhandler.cpp:166 src/net/manaserv/beinghandler.cpp:288
-#, fuzzy
-msgid " "
-msgstr "; "
-
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -536,56 +429,60 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:386
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:400 src/commandhandler.cpp:448
-#: src/commandhandler.cpp:470
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Name der Party fehlt."
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:418
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:418
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:431
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:477
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:461
+#: src/commandhandler.cpp:484
 #, fuzzy
 msgid "Player successfully ignored!"
 msgstr "Party erfolgreich erstellt."
 
-#: src/commandhandler.cpp:463
+#: src/commandhandler.cpp:486
 #, fuzzy
 msgid "Player could not be ignored!"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/commandhandler.cpp:478
+#: src/commandhandler.cpp:501
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:483
+#: src/commandhandler.cpp:506
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:508
 #, fuzzy
 msgid "Player could not be unignored!"
 msgstr ""
@@ -597,254 +494,102 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/engine.cpp:80
-msgid "maps/"
-msgstr ""
-
-#: src/engine.cpp:80
-msgid ".tmx"
-msgstr ""
-
-#: src/engine.cpp:83
-msgid ".gz"
-msgstr ""
-
-#: src/engine.cpp:90 src/engine.cpp:92
-#, c-format
-msgid "Error while loading %s"
-msgstr "Fehler beim Laden von %s"
-
-#: src/engine.cpp:91
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "Karte konnte nicht geladen werden"
-
-#: src/game.cpp:233
-#, fuzzy
-msgid "ItemShortcut"
-msgstr "Kurztaste %d"
-
-#: src/game.cpp:235
-#, fuzzy
-msgid "EmoteShortcut"
-msgstr "Gefühlstaste %d"
-
-#: src/game.cpp:240
+#: src/game.cpp:172
 msgid "General"
 msgstr "Öffentlich"
 
-#: src/game.cpp:242
-#, fuzzy
-msgid "logToChat"
-msgstr "Chat"
-
-#: src/game.cpp:305 src/net/ea/playerhandler.cpp:195
-msgid "."
-msgstr ""
-
-#: src/game.cpp:324 src/game.cpp:325 src/game.cpp:421
-#: src/gui/setup_video.cpp:188 src/gui/setup_video.cpp:401 src/main.cpp:325
-#, fuzzy
-msgid "fpslimit"
-msgstr "Aufteilen"
-
-#: src/game.cpp:365
-msgid "Desktop"
-msgstr ""
-
-#: src/game.cpp:391 src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:390
-#: src/gui/statuswindow.cpp:418 src/gui/updatewindow.cpp:330
-#: src/gui/updatewindow.cpp:341 src/gui/updatewindow.cpp:345
-#: src/gui/updatewindow.cpp:367 src/gui/updatewindow.cpp:392
-#: src/gui/updatewindow.cpp:427 src/gui/updatewindow.cpp:442
-#: src/gui/updatewindow.cpp:472 src/main.cpp:236 src/main.cpp:238
-#: src/main.cpp:242 src/main.cpp:247 src/main.cpp:1012
-msgid "/"
-msgstr ""
-
-#: src/game.cpp:392
-#, fuzzy
-msgid "Mana_Screenshot_"
-msgstr "Bildschirmfoto"
-
-#: src/game.cpp:392
-msgid ".png"
-msgstr ""
-
-#: src/game.cpp:405
+#: src/game.cpp:326
 #, fuzzy
 msgid "Screenshot saved as "
 msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
 
-#: src/game.cpp:410
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:411
-msgid "Error: could not save screenshot."
-msgstr ""
-
-#: src/game.cpp:486
+#: src/game.cpp:355
 #, fuzzy
 msgid "The connection to the server was lost."
 msgstr ""
 "Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:534 src/game.cpp:896
-#, c-format
-msgid "Warning: guichan input exception: %s"
-msgstr ""
-
-#: src/game.cpp:564 src/gui/changeemaildialog.cpp:55
-#: src/gui/changeemaildialog.cpp:105 src/gui/changepassworddialog.cpp:58
-#: src/gui/changepassworddialog.cpp:86 src/gui/charcreatedialog.cpp:80
-#: src/gui/charcreatedialog.cpp:182 src/gui/itemamount.cpp:101
-#: src/gui/itemamount.cpp:181 src/gui/npcpostdialog.cpp:54
-#: src/gui/npcpostdialog.cpp:96 src/gui/popupmenu.cpp:347
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/register.cpp:145
-#: src/gui/trade.cpp:287 src/gui/unregisterdialog.cpp:56
-#: src/gui/unregisterdialog.cpp:86 src/gui/unregisterdialog.cpp:97
-#: src/gui/updatewindow.cpp:144 src/gui/updatewindow.cpp:210
-#, fuzzy
-msgid "cancel"
-msgstr "Abbrechen"
-
-#: src/game.cpp:567 src/gui/itemamount.cpp:100 src/gui/itemamount.cpp:201
-#: src/gui/npcdialog.cpp:93 src/gui/npcdialog.cpp:154 src/gui/okdialog.cpp:42
-#: src/gui/okdialog.cpp:80 src/gui/quitdialog.cpp:46
-#: src/gui/quitdialog.cpp:105 src/gui/register.cpp:53
-#: src/gui/serverdialog.cpp:186 src/gui/trade.cpp:232 src/gui/trade.cpp:295
-#: src/main.cpp:984
-msgid "ok"
-msgstr ""
-
-#: src/game.cpp:707
-#, fuzzy
-msgid "index"
-msgstr "Im Fenster"
-
-#: src/game.cpp:853
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:860
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/gui/buy.cpp:47 src/gui/buy.cpp:50 src/gui/buy.cpp:76
-#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:86
-msgid "Buy"
-msgstr "Kaufen"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Karte konnte nicht geladen werden"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:260 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:279
+#: src/game.cpp:947
 #, c-format
-msgid "%d / %d"
-msgstr ""
+msgid "Error while loading %s"
+msgstr "Fehler beim Laden von %s"
 
-#: src/gui/buy.cpp:67 src/gui/buy.cpp:262 src/gui/sell.cpp:69
-#: src/gui/sell.cpp:280
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Party (%s)"
+
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Kaufen"
+
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
 
-#: src/gui/buy.cpp:72 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:96
-#: src/gui/sell.cpp:72 src/gui/skilldialog.cpp:241
-#: src/gui/statuswindow.cpp:479
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
 msgid "+"
 msgstr "+"
 
-#: src/gui/buy.cpp:72 src/gui/buy.cpp:169 src/gui/itemamount.cpp:99
-#: src/gui/itemamount.cpp:185 src/gui/npcdialog.cpp:96
-#: src/gui/npcdialog.cpp:213 src/gui/sell.cpp:72 src/gui/sell.cpp:164
-#: src/gui/skilldialog.cpp:112 src/gui/skilldialog.cpp:241
-#: src/gui/statuswindow.cpp:479
-msgid "inc"
-msgstr "Verringern"
-
-#: src/gui/buy.cpp:75 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:97
-#: src/gui/sell.cpp:73 src/gui/statuswindow.cpp:491
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
 msgid "-"
 msgstr "-"
 
-#: src/gui/buy.cpp:75 src/gui/buy.cpp:175 src/gui/itemamount.cpp:98
-#: src/gui/itemamount.cpp:189 src/gui/npcdialog.cpp:97
-#: src/gui/npcdialog.cpp:217 src/gui/sell.cpp:73 src/gui/sell.cpp:170
-#: src/gui/statuswindow.cpp:491
-msgid "dec"
-msgstr ""
-
-#: src/gui/buy.cpp:76 src/gui/buy.cpp:190
-#, fuzzy
-msgid "buy"
-msgstr "Kaufen"
-
-#: src/gui/buy.cpp:77 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:75 src/gui/serverdialog.cpp:127
-#: src/keyboardconfig.cpp:102
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/gui/buy.cpp:77 src/gui/buy.cpp:149 src/gui/sell.cpp:75
-#: src/gui/sell.cpp:144 src/gui/serverdialog.cpp:127
-#: src/gui/serverdialog.cpp:244 src/gui/widgets/channeltab.cpp:71
-#: src/gui/widgets/channeltab.cpp:109
-#, fuzzy
-msgid "quit"
-msgstr "Beenden"
-
-#: src/gui/buy.cpp:78 src/gui/sell.cpp:76 src/gui/statuswindow.cpp:408
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
 #: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
 msgid "Max"
 msgstr "Max"
 
-#: src/gui/buy.cpp:78 src/gui/buy.cpp:181 src/gui/sell.cpp:76
-#: src/gui/sell.cpp:176 src/gui/setup_video.cpp:173
-msgid "max"
-msgstr "max"
-
-#: src/gui/buy.cpp:79 src/gui/buy.cpp:229 src/gui/buy.cpp:247
-#: src/gui/sell.cpp:77 src/gui/sell.cpp:252 src/gui/sell.cpp:266
-#, c-format
-msgid "Description: %s"
-msgstr "Beschreibung: %s"
-
-#: src/gui/buy.cpp:80 src/gui/buy.cpp:231 src/gui/buy.cpp:248
-#: src/gui/sell.cpp:78 src/gui/sell.cpp:254 src/gui/sell.cpp:267
-#, c-format
-msgid "Effect: %s"
-msgstr "Effekt: %s"
-
-#: src/gui/buy.cpp:90 src/gui/buy.cpp:164 src/gui/sell.cpp:90
-#: src/gui/sell.cpp:159
-msgid "slider"
-msgstr ""
-
-#: src/gui/buysell.cpp:35
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Geschäft"
 
-#: src/gui/buysell.cpp:38
-#, fuzzy
-msgid "BuySell"
-msgstr "Verkaufen"
-
-#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:90 src/gui/sell.cpp:47
-#: src/gui/sell.cpp:50 src/gui/sell.cpp:74
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:94
-#: src/gui/changeemaildialog.cpp:55 src/gui/changepassworddialog.cpp:58
-#: src/gui/charcreatedialog.cpp:80 src/gui/connectiondialog.cpp:38
-#: src/gui/itemamount.cpp:101 src/gui/npcpostdialog.cpp:54
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:400 src/gui/quitdialog.cpp:47 src/gui/register.cpp:74
-#: src/gui/setup.cpp:51 src/gui/setup.cpp:106 src/gui/textdialog.cpp:37
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -862,17 +607,6 @@ msgstr "Account: %s"
 msgid "Type new email address twice:"
 msgstr "Gib die neue E-Mailadresse zweimal ein:"
 
-#: src/gui/changeemaildialog.cpp:54 src/gui/changeemaildialog.cpp:94
-#: src/gui/changeemaildialog.cpp:95 src/gui/changeemaildialog.cpp:109
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:213
-msgid "change_email"
-msgstr ""
-
-#: src/gui/changeemaildialog.cpp:115
-#, c-format
-msgid "ChangeEmailDialog::Email change, Username is %s"
-msgstr ""
-
 #: src/gui/changeemaildialog.cpp:127
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
@@ -887,27 +621,11 @@ msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
 msgid "The email address entries mismatch."
 msgstr "Die neuen E-Mailadresse stimmen nicht überein."
 
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:196 src/gui/unregisterdialog.cpp:134
-#: src/main.cpp:1110 src/main.cpp:1117 src/main.cpp:1252
-#: src/net/ea/charserverhandler.cpp:129 src/net/ea/charserverhandler.cpp:148
-#: src/net/manaserv/charhandler.cpp:127 src/net/manaserv/charhandler.cpp:229
-msgid "Error"
-msgstr "Fehler"
-
 #: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
 #: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/gui/changepassworddialog.cpp:56 src/gui/changepassworddialog.cpp:74
-#: src/gui/changepassworddialog.cpp:75 src/gui/changepassworddialog.cpp:76
-#: src/gui/changepassworddialog.cpp:90 src/gui/charselectdialog.cpp:128
-#: src/gui/charselectdialog.cpp:209
-msgid "change_password"
-msgstr "Passwort ändern"
-
 #: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
@@ -917,11 +635,6 @@ msgstr "Passwort:"
 msgid "Type new password twice:"
 msgstr "Gib dein neues Passwort zweimal ein:"
 
-#: src/gui/changepassworddialog.cpp:97
-#, c-format
-msgid "ChangePasswordDialog::Password change, Username is %s"
-msgstr ""
-
 #: src/gui/changepassworddialog.cpp:110
 msgid "Enter the old password first."
 msgstr ""
@@ -940,74 +653,51 @@ msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
 msgid "The new password entries mismatch."
 msgstr "Die neues Passwörter stimmen nicht überein."
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/charcreatedialog.cpp:68 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name :"
 
-#: src/gui/charcreatedialog.cpp:71 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:71 src/gui/charcreatedialog.cpp:184
-msgid "nextcolor"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:77
-#: src/gui/outfitwindow.cpp:65
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:189
-msgid "prevcolor"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:75
+#: src/gui/charcreatedialog.cpp:74
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:194
-msgid "nextstyle"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:77 src/gui/charcreatedialog.cpp:199
-msgid "prevstyle"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:78
+#: src/gui/charcreatedialog.cpp:77
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#: src/gui/charcreatedialog.cpp:79 src/gui/charselectdialog.cpp:364
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Erstellen"
 
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:97
-#: src/gui/charcreatedialog.cpp:158 src/net/ea/gui/partytab.cpp:69
-#: src/net/ea/gui/partytab.cpp:110
-msgid "create"
-msgstr "Erstellen"
-
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Männlich"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:87 src/gui/charcreatedialog.cpp:88
-#: src/gui/charcreatedialog.cpp:207 src/resources/itemdb.cpp:291
-msgid "gender"
-msgstr "Geschlecht"
-
-#: src/gui/charcreatedialog.cpp:82 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/gui/charcreatedialog.cpp:100 src/gui/charcreatedialog.cpp:245
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
@@ -1016,35 +706,24 @@ msgstr "Bitte verteile %d Punkte"
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: src/gui/charcreatedialog.cpp:204 src/gui/charcreatedialog.cpp:303
-msgid "statslider"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:237
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/charcreatedialog.cpp:249
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
 
-#: src/gui/charselectdialog.cpp:67
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/charselectdialog.cpp:68
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/charselectdialog.cpp:76 src/gui/confirmdialog.cpp:42
-#: src/gui/confirmdialog.cpp:90 src/gui/guildwindow.cpp:171
-#: src/gui/partywindow.cpp:206 src/gui/updatewindow.cpp:74
-#: src/net/ea/tradehandler.cpp:53 src/net/manaserv/tradehandler.cpp:60
-msgid "yes"
-msgstr "Ja"
-
-#: src/gui/charselectdialog.cpp:119
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Account- und Charakterverwaltung"
 
@@ -1052,139 +731,46 @@ msgstr "Account- und Charakterverwaltung"
 msgid "Switch Login"
 msgstr "Login wechseln"
 
-#: src/gui/charselectdialog.cpp:127 src/gui/charselectdialog.cpp:187
-msgid "switch"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:146 src/gui/unregisterdialog.cpp:47
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
 #: src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Abmelden"
 
-#: src/gui/charselectdialog.cpp:147 src/gui/charselectdialog.cpp:217
-#: src/gui/unregisterdialog.cpp:55 src/gui/unregisterdialog.cpp:101
-#, fuzzy
-msgid "unregister"
-msgstr "Abmelden"
-
-#: src/gui/charselectdialog.cpp:154
+#: src/gui/charselectdialog.cpp:150
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
-#: src/gui/charselectdialog.cpp:183 src/gui/charselectdialog.cpp:355
-#: src/gui/inventorywindow.cpp:81 src/gui/inventorywindow.cpp:178
-#: src/gui/popupmenu.cpp:282 src/gui/specialswindow.cpp:109
-#: src/gui/specialswindow.cpp:213
-msgid "use"
-msgstr "benutze"
-
-#: src/gui/charselectdialog.cpp:192 src/gui/charselectdialog.cpp:365
-#: src/net/ea/gui/partytab.cpp:69 src/net/ea/gui/partytab.cpp:110
-msgid "new"
-msgstr "Neu"
-
-#: src/gui/charselectdialog.cpp:202 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:213
-msgid "delete"
-msgstr "Löschen"
-
-#: src/gui/charselectdialog.cpp:305 src/gui/charselectdialog.cpp:308
-msgid "wwwwwwwww"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:305
-msgid "go"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:306
-msgid "wwwwwwwwwwwwwwwwwwwwwwww"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:307
-msgid "(888)"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:310 src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:354
+#: src/gui/charselectdialog.cpp:387
 msgid "Choose"
 msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:356
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:357
-#, c-format
-msgid "Level %d"
-msgstr "Stufe: %d"
-
-#: src/gui/charselectdialog.cpp:366 src/gui/charselectdialog.cpp:367
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:75 src/gui/chat.cpp:79 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:96 src/gui/chat.cpp:179
-msgid "chatinput"
-msgstr ""
-
-#: src/gui/chat.cpp:110 src/gui/chat.cpp:117
-#, fuzzy
-msgid "ReturnToggles"
-msgstr "Enter-Taste schließt Chatzeile."
-
-#: src/gui/chat.cpp:296
+#: src/gui/chat.cpp:287
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chat.cpp:307 src/gui/chat.cpp:416 src/gui/widgets/chattab.cpp:171
-msgid "["
-msgstr ""
-
-#: src/gui/chat.cpp:309 src/gui/serverdialog.cpp:70
-#: src/gui/serverdialog.cpp:78 src/gui/widgets/chattab.cpp:173
-#: src/net/manaserv/chathandler.cpp:307 src/net/manaserv/chathandler.cpp:308
-#: src/net/manaserv/chathandler.cpp:319
-msgid ":"
-msgstr ""
-
-#: src/gui/chat.cpp:311 src/gui/widgets/chattab.cpp:175
-msgid "] "
-msgstr ""
-
-#: src/gui/chat.cpp:314
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
 
-#: src/gui/chat.cpp:416
-msgid "]"
-msgstr ""
-
-#: src/gui/chat.cpp:456 src/gui/setup_players.cpp:229
-#: src/gui/setup_players.cpp:336 src/gui/setup_players.cpp:341
-msgid "whispertab"
-msgstr "geflüsterte Nachricht"
-
-#: src/gui/chat.cpp:472
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
 
-#: src/gui/chat.cpp:477 src/gui/widgets/chattab.cpp:83
-#: src/gui/widgets/chattab.cpp:201 src/net/ea/chathandler.cpp:120
-#: src/net/ea/chathandler.cpp:146 src/net/ea/chathandler.cpp:176
-#: src/net/manaserv/chathandler.cpp:161
-#, fuzzy
-msgid " : "
-msgstr " host: "
-
 #: src/gui/confirmdialog.cpp:42
 msgid "Yes"
 msgstr "Ja"
@@ -1193,29 +779,7 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/confirmdialog.cpp:43 src/gui/confirmdialog.cpp:90
-#: src/gui/partywindow.cpp:213
-msgid "no"
-msgstr "Nein"
-
-#: src/gui/connectiondialog.cpp:34 src/net/ea/charserverhandler.cpp:142
-#: src/net/manaserv/charhandler.cpp:108
-msgid "Info"
-msgstr "Info"
-
-#: src/gui/connectiondialog.cpp:38
-msgid "cancelButton"
-msgstr ""
-
-#: src/gui/connectiondialog.cpp:40 src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Verbinde..."
-
-#: src/gui/connectiondialog.cpp:56
-msgid "Cancel pressed"
-msgstr "Abbrechen wurde gedrückt"
-
-#: src/gui/debugwindow.cpp:43 src/gui/debugwindow.cpp:45
+#: src/gui/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
@@ -1229,265 +793,101 @@ msgstr ""
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, c-format
 msgid "Music: %s"
 msgstr "Musik: %s"
 
-#: src/gui/debugwindow.cpp:66
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
 #, c-format
 msgid "Map: %s"
 msgstr "Karte : %s"
 
-#: src/gui/debugwindow.cpp:67
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
 #, c-format
 msgid "Minimap: %s"
 msgstr "Übersichtskarte: %s"
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:96
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
 #, c-format
 msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikelzählung: %d"
 
-#: src/gui/debugwindow.cpp:104
-msgid "Music: "
-msgstr "Lautstärke der Musik: "
-
-#: src/gui/debugwindow.cpp:104 src/gui/setup_audio.cpp:54
-#: src/gui/setup_audio.cpp:140 src/gui/updatewindow.cpp:459
-msgid "music"
-msgstr "Musik"
-
-#: src/gui/debugwindow.cpp:108
-msgid "Minimap: "
-msgstr "Übersichtskarte: "
-
-#: src/gui/debugwindow.cpp:108 src/gui/minimap.cpp:100
-msgid "minimap"
-msgstr "Übersichtskarte"
-
-#: src/gui/debugwindow.cpp:112
-msgid "Map: "
-msgstr "Karte: "
-
-#: src/gui/debugwindow.cpp:112
-#, fuzzy
-msgid "_filename"
-msgstr "Sichtbare Namen"
-
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:116
 #, c-format
 msgid "Particle detail: %s"
 msgstr "Partikeldetails: %s"
 
-#: src/gui/debugwindow.cpp:126
+#: src/gui/debugwindow.cpp:121
 #, c-format
 msgid "Ambient FX: %s"
 msgstr "Hintergrundeffekte: %s"
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/equipmentwindow.cpp:80
-#: src/gui/windowmenu.cpp:56 src/gui/windowmenu.cpp:114
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:86 src/gui/inventorywindow.cpp:76
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:283
-#: src/gui/popupmenu.cpp:370
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/equipmentwindow.cpp:86 src/gui/equipmentwindow.cpp:157
-#: src/gui/outfitwindow.cpp:72 src/gui/outfitwindow.cpp:155
-msgid "unequip"
-msgstr "Ausziehen"
-
-#: src/gui/guildwindow.cpp:53 src/gui/guildwindow.cpp:56
-#: src/gui/guildwindow.cpp:57
-msgid "Guild"
-msgstr "Gilde"
-
-#: src/gui/guildwindow.cpp:67
-msgid "Create Guild"
-msgstr "Gilde erstellen"
-
-#: src/gui/guildwindow.cpp:67 src/gui/guildwindow.cpp:113
-msgid "CREATE_GUILD"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:68
-msgid "Invite User"
-msgstr "Spieler einladen"
-
-#: src/gui/guildwindow.cpp:68 src/gui/guildwindow.cpp:122
-msgid "INVITE_USER"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:69
-msgid "Quit Guild"
-msgstr "Gilde verlassen"
-
-#: src/gui/guildwindow.cpp:69 src/gui/guildwindow.cpp:131
-msgid "QUIT_GUILD"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:117
-msgid "Guild Name"
-msgstr "Gildenname"
-
-#: src/gui/guildwindow.cpp:118
-msgid "Choose your guild's name."
-msgstr "Wähle den Namen deiner Gilde"
-
-#: src/gui/guildwindow.cpp:119 src/gui/guildwindow.cpp:141
-msgid "CREATE_GUILD_OK"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:126
-msgid "Member Invite"
-msgstr "Spieler einladen"
-
-#: src/gui/guildwindow.cpp:127
-msgid "Who would you like to invite?"
-msgstr "Wen möchtest du einladen?"
-
-#: src/gui/guildwindow.cpp:128 src/gui/guildwindow.cpp:158
-msgid "INVITE_USER_OK"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:137
-#, c-format
-msgid "Guild %s quit."
-msgstr "Gilde %s wurde aufgelöst."
-
-#: src/gui/guildwindow.cpp:154
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Erstelle der Gilde %s."
-
-#: src/gui/guildwindow.cpp:168
-#, c-format
-msgid "Invited user %s."
-msgstr "Spieler %s einladen"
-
-#: src/gui/guildwindow.cpp:173
-msgid "Sending invitation acceptance."
-msgstr ""
-
-#: src/gui/guildwindow.cpp:245
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
-
-#: src/gui/guildwindow.cpp:249
-msgid "Accept Guild Invite"
-msgstr "Nehme Gildeneinladung an"
-
-#: src/gui/help.cpp:35 src/gui/help.cpp:40
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/help.cpp:49 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:70
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/help.cpp:49 src/gui/help.cpp:69 src/gui/skilldialog.cpp:119
-#: src/gui/specialswindow.cpp:123 src/gui/storagewindow.cpp:70
-#: src/gui/storagewindow.cpp:148 src/gui/widgets/whispertab.cpp:61
-#: src/gui/widgets/whispertab.cpp:79 src/gui/widgets/whispertab.cpp:99
-msgid "close"
-msgstr "Schließen"
-
-#: src/gui/help.cpp:85
-msgid "header"
-msgstr ""
-
-#: src/gui/help.cpp:96
-msgid "help/"
-msgstr "Hilfe"
-
-#: src/gui/help.cpp:96
-msgid ".txt"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:55 src/gui/inventorywindow.cpp:60
-#: src/gui/windowmenu.cpp:57 src/gui/windowmenu.cpp:118
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:71 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:285 src/gui/popupmenu.cpp:372
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:289 src/gui/popupmenu.cpp:375
-#: src/gui/specialswindow.cpp:213
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:82 src/gui/inventorywindow.cpp:293
-#: src/gui/popupmenu.cpp:378
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
 msgid "Drop..."
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:82 src/gui/inventorywindow.cpp:190
-#: src/gui/popupmenu.cpp:309
-msgid "drop"
-msgstr "Wegwerfen"
-
-#: src/gui/inventorywindow.cpp:83 src/gui/popupmenu.cpp:384
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:194
-#: src/gui/popupmenu.cpp:303
-msgid "split"
-msgstr "Aufteilen"
-
-#: src/gui/inventorywindow.cpp:84 src/gui/outfitwindow.cpp:50
-#: src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:163
-msgid "outfit"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:95 src/gui/storagewindow.cpp:80
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "Plätze:"
 
-#: src/gui/inventorywindow.cpp:96
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:154 src/gui/storagewindow.cpp:83
-#: src/gui/storagewindow.cpp:121
-#, c-format
-msgid "%d/%d"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:155
-#, c-format
-msgid "%s/%s"
-msgstr "%s: %s"
-
-#: src/gui/inventorywindow.cpp:295 src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr "Wegwerfen"
 
-#: src/gui/itemamount.cpp:90 src/gui/itemamount.cpp:197
-msgid "slide"
-msgstr ""
-
 #: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:36
-#: src/gui/textdialog.cpp:77 src/gui/trade.cpp:74 src/gui/trade.cpp:76
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
 msgid "OK"
 msgstr "Ok"
 
@@ -1495,10 +895,6 @@ msgstr "Ok"
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:102 src/gui/itemamount.cpp:193
-msgid "all"
-msgstr "alle"
-
 #: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
@@ -1519,11 +915,7 @@ msgstr "Wähle aus, wie viele Gegenstände du wieder haben möchtest."
 msgid "Select amount of items to split."
 msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
 
-#: src/gui/itempopup.cpp:40
-msgid "ItemPopup"
-msgstr ""
-
-#: src/gui/itempopup.cpp:91
+#: src/gui/itempopup.cpp:92
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
@@ -1540,73 +932,36 @@ msgstr "Benutzername merken"
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/login.cpp:59 src/gui/login.cpp:116 src/gui/register.cpp:73
-#: src/gui/register.cpp:122 src/gui/register.cpp:123 src/gui/register.cpp:124
-#: src/gui/register.cpp:149
-msgid "register"
-msgstr "Registrieren"
-
 #: src/gui/login.cpp:60
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
-#: src/gui/login.cpp:60 src/gui/login.cpp:112 src/gui/serverdialog.cpp:372
-#: src/main.cpp:561
-msgid "server"
-msgstr "Server"
-
-#: src/gui/login.cpp:61 src/gui/login.cpp:63 src/gui/login.cpp:64
-#: src/gui/login.cpp:100 src/gui/worldselectdialog.cpp:76
-#: src/gui/worldselectdialog.cpp:121
-msgid "login"
-msgstr "Anmelden"
-
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "Karte"
 
-#: src/gui/minimap.cpp:51
-msgid "Minimap"
-msgstr "Übersichtskarte"
-
-#: src/gui/minimap.cpp:52 src/gui/minimap.cpp:71
-msgid "Show"
-msgstr "Zeigen"
-
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "Warte auf den Server"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/npcdialog.cpp:45
 msgid "Next"
 msgstr "Weiter"
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr "Absenden"
 
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:56
-msgid "NpcText"
-msgstr "NpcText"
-
-#: src/gui/npcdialog.cpp:106
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr "Zurücksetzten"
 
-#: src/gui/npcdialog.cpp:106 src/gui/npcdialog.cpp:202
-msgid "reset"
-msgstr "Zurücksetzten"
-
-#: src/gui/npcdialog.cpp:134 src/gui/setup_video.cpp:461
-#: src/gui/updatewindow.cpp:265 src/gui/updatewindow.cpp:269
-msgid "\n"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:160
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
 msgid ""
 "\n"
 "> Next\n"
@@ -1614,79 +969,29 @@ msgstr ""
 "\n"
 "Weiter\n"
 
-#: src/gui/npcdialog.cpp:195 src/gui/setup_colors.cpp:385
-#: src/gui/trade.cpp:323
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:199
-#, c-format
-msgid ""
-"\n"
-"> \"%s\"\n"
-msgstr ""
-
-#: src/gui/npcpostdialog.cpp:44
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr "Nach:"
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "Senden"
 
-#: src/gui/npcpostdialog.cpp:51 src/gui/npcpostdialog.cpp:81
-msgid "send"
-msgstr "Senden"
-
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang den Brief zu senden oder er war ungültig."
 
-#: src/gui/outfitwindow.cpp:65 src/gui/outfitwindow.cpp:145
-msgid "previous"
-msgstr "Zurück"
-
-#: src/gui/outfitwindow.cpp:66 src/gui/outfitwindow.cpp:135
-msgid "next"
-msgstr "Weiter"
-
-#: src/gui/outfitwindow.cpp:67 src/gui/outfitwindow.cpp:142
-#: src/gui/outfitwindow.cpp:152
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:69
+#: src/gui/outfitwindow.cpp:70
 msgid "Unequip first"
 msgstr "erstes ausziehen"
 
-#: src/gui/outfitwindow.cpp:70
-msgid "OutfitUnequip0"
-msgstr "Ausziehen"
-
-#: src/gui/outfitwindow.cpp:99 src/gui/outfitwindow.cpp:127
-msgid "Outfit"
-msgstr ""
-
-#: src/gui/outfitwindow.cpp:99 src/gui/skilldialog.cpp:203
-#: src/gui/specialswindow.cpp:187
-msgid "-1"
-msgstr "-1"
-
-#: src/gui/outfitwindow.cpp:113 src/gui/outfitwindow.cpp:128
-msgid "OutfitUnequip"
-msgstr "Ausziehen"
-
-#: src/gui/palette.cpp:51
-msgid "Color"
-msgstr "Farbe"
-
-#: src/gui/palette.cpp:80
-msgid "  "
-msgstr ""
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "Text"
 
@@ -1750,205 +1055,156 @@ msgstr "geflüsterte Nachricht"
 msgid "Is"
 msgstr "Handlungen"
 
-#: src/gui/palette.cpp:101 src/gui/partywindow.cpp:55
-#: src/gui/partywindow.cpp:57 src/gui/partywindow.cpp:83
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/palette.cpp:102 src/net/ea/chathandler.cpp:98
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gilde"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr "Server"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "Logger"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "Verknüpfung"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr "Aktionen"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "Namen anderer Spieler"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "Eigener Name"
 
-#: src/gui/palette.cpp:109
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "Namen von GM"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr "Unbekannter Gegenstand"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr "Allgemeiner Gegenstand"
 
-#: src/gui/palette.cpp:115
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr "Hüte"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr "Benutzbare Gegenstände"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr "Hemden"
 
-#: src/gui/palette.cpp:118
+#: src/gui/palette.cpp:119
 msgid "One Handed Weapons"
 msgstr "Einhänder"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "Hosen"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "Schuhe"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:122
 msgid "Two Handed Weapons"
 msgstr "Zweihänder"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr "Schilde"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "Ringe"
 
-#: src/gui/palette.cpp:124
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr "Halsketten"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr "Waffen"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "Munition"
 
-#: src/gui/palette.cpp:128
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/palette.cpp:129
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr "aufgehobene Gegenstände"
 
-#: src/gui/palette.cpp:130
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr "Anzeige der Erfahrungspunkte"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:133
 msgid "Player Hits Monster"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/palette.cpp:134
+#: src/gui/palette.cpp:135
 msgid "Monster Hits Player"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritischer Treffer"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr "Verfehlt"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr "HP Leiste"
 
-#: src/gui/palette.cpp:139
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr "3/4 HP Leiste"
 
-#: src/gui/palette.cpp:140
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr "1/2 HP Leiste"
 
-#: src/gui/palette.cpp:141
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr "1/4 HP Leiste"
 
-#: src/gui/palette.cpp:152 src/gui/palette.cpp:285
-#, fuzzy
-msgid "Gradient"
-msgstr "Handeln"
-
-#: src/gui/palette.cpp:155 src/gui/palette.cpp:286
-msgid "Delay"
-msgstr "Verzögerung: "
-
-#: src/gui/palette.cpp:160 src/gui/palette.cpp:276
-#, c-format
-msgid "0x%06x"
-msgstr ""
-
-#: src/gui/partywindow.cpp:78
-#, c-format
-msgid "Party (%s)"
-msgstr "Party (%s)"
-
-#: src/gui/partywindow.cpp:178
-msgid "Received party request, but one already exists."
-msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
-
-#: src/gui/partywindow.cpp:186
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s hat dich in seine Party eingeladen."
-
-#: src/gui/partywindow.cpp:189
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
-
-#: src/gui/partywindow.cpp:195
-msgid "Accept Party Invite"
-msgstr "Nehme Partyeinladung an"
-
-#: src/gui/partywindow.cpp:208
-#, c-format
-msgid "Accepted invite from %s."
-msgstr "Partyeinladung von %s angenommen."
-
-#: src/gui/partywindow.cpp:215
-#, c-format
-msgid "Rejected invite from %s."
-msgstr "Partyeinladung von %s abgelehnt."
-
-#: src/gui/popupmenu.cpp:58
-msgid "PopupMenu"
-msgstr ""
-
 #: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
 msgid "Trade with %s..."
 msgstr "Handele mit %s"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, fuzzy, c-format
 msgid "Attack %s"
 msgstr "Angriff %+d"
@@ -1958,149 +1214,80 @@ msgstr "Angriff %+d"
 msgid "Whisper %s"
 msgstr "flüstere %s"
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:101
 #, c-format
 msgid "Befriend %s"
 msgstr "Sei Freund von %s"
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:106
 #, fuzzy, c-format
 msgid "Disregard %s"
 msgstr "Unbeachtet"
 
-#: src/gui/popupmenu.cpp:108
+#: src/gui/popupmenu.cpp:109
 #, c-format
 msgid "Ignore %s"
 msgstr "Ignoriere %s"
 
-#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
 msgid "Unignore %s"
 msgstr "Ignoriere %s nicht mehr"
 
-#: src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:118
 #, c-format
 msgid "Completely ignore %s"
 msgstr "Ignoriere %s komplett"
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:130
+#, c-format
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
 #, c-format
 msgid "Invite %s to join your guild"
 msgstr "Lade %s in deine Gilde ein"
 
-#: src/gui/popupmenu.cpp:136
+#: src/gui/popupmenu.cpp:137
 #, c-format
 msgid "Invite %s to join your party"
 msgstr "Lade %s in deine Party ein"
 
-#: src/gui/popupmenu.cpp:143
+#: src/gui/popupmenu.cpp:144
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152
+#: src/gui/popupmenu.cpp:153
 #, c-format
 msgid "Talk to %s"
 msgstr "Rede mit %s"
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:166
 msgid "Kick monster"
 msgstr "Monster töten"
 
-#: src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:174
 msgid "Add name to chat"
 msgstr "Füge Namen zu Chat hinzu"
 
-#: src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:191
 #, c-format
 msgid "Pick up %s"
 msgstr "Hebe %s auf"
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
 msgid "Add to chat"
 msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:206
-msgid "talk"
-msgstr "Sprechen"
-
-#: src/gui/popupmenu.cpp:215 src/gui/trade.cpp:240 src/gui/trade.cpp:304
-msgid "trade"
-msgstr "Handeln"
-
-#: src/gui/popupmenu.cpp:223 src/resources/itemdb.cpp:52
-#: src/resources/monsterdb.cpp:129 src/resources/monsterdb.cpp:135
-msgid "attack"
-msgstr "Angriff"
-
-#: src/gui/popupmenu.cpp:229
-msgid "/w \""
-msgstr ""
-
-#: src/gui/popupmenu.cpp:245
-#, fuzzy
-msgid "disregard"
-msgstr "Unbeachtet"
-
-#: src/gui/popupmenu.cpp:252
-msgid "friend"
-msgstr "Freund"
-
-#: src/gui/popupmenu.cpp:259
-msgid "guild"
-msgstr "Gilde"
-
-#: src/gui/popupmenu.cpp:272
-msgid "pickup"
-msgstr "Aufheben"
-
-#: src/gui/popupmenu.cpp:278
-msgid "look"
-msgstr "Schauen "
-
-#: src/gui/popupmenu.cpp:298
-msgid "chat"
-msgstr "Chat"
-
-#: src/gui/popupmenu.cpp:315 src/gui/storagewindow.cpp:67
-#: src/gui/storagewindow.cpp:127
-msgid "store"
-msgstr "Einlagern"
-
-#: src/gui/popupmenu.cpp:321 src/gui/storagewindow.cpp:68
-#: src/gui/storagewindow.cpp:138
-msgid "retrieve"
-msgstr "Abholen"
-
-#: src/gui/popupmenu.cpp:332 src/gui/serverdialog.cpp:383
-#: src/gui/skilldialog.cpp:189 src/gui/skilldialog.cpp:204
-#: src/gui/specialswindow.cpp:173 src/gui/specialswindow.cpp:190
-#: src/playerrelations.cpp:38 src/resources/itemdb.cpp:147
-#: src/resources/monsterdb.cpp:67
-msgid "name"
-msgstr "Name"
-
-#: src/gui/popupmenu.cpp:338
-msgid "admin-kick"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:349
-#, c-format
-msgid "PopupMenu: Warning, unknown action '%s'"
-msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
-
-#: src/gui/popupmenu.cpp:389 src/gui/storagewindow.cpp:67
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
 msgid "Store"
 msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:396 src/gui/storagewindow.cpp:68
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
 msgid "Retrieve"
 msgstr "Abholen"
 
-#: src/gui/quitdialog.cpp:42 src/gui/quitdialog.cpp:43
-#: src/gui/quitdialog.cpp:44 src/gui/quitdialog.cpp:45
-msgid "quitdialog"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Server wechseln"
@@ -2109,39 +1296,31 @@ msgstr "Server wechseln"
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
-#: src/gui/recorder.cpp:40
-msgid "Recorder"
-msgstr "Aufzeichnung"
-
-#: src/gui/recorder.cpp:45
-msgid "activate"
-msgstr ""
-
-#: src/gui/recorder.cpp:88
+#: src/gui/recorder.cpp:87
 msgid "Finishing recording."
 msgstr "Aufzeichnung abgeschlossen."
 
-#: src/gui/recorder.cpp:92
+#: src/gui/recorder.cpp:91
 msgid "Not currently recording."
 msgstr "Es läuft keine Aufzeichnung."
 
-#: src/gui/recorder.cpp:97
+#: src/gui/recorder.cpp:96
 msgid "Already recording."
 msgstr "Es läuft bereits eine Aufzeichnung."
 
-#: src/gui/recorder.cpp:105
+#: src/gui/recorder.cpp:104
 msgid "Starting to record..."
 msgstr "Starte Aufzeichnung..."
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr "Start der Aufzeichnung fehlgeschlagen."
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr "Aufzeichnung läuft..."
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr "Stoppe Aufzeichnung"
 
@@ -2149,19 +1328,10 @@ msgstr "Stoppe Aufzeichnung"
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: src/gui/register.cpp:90 src/gui/register.cpp:91
-msgid "sex"
-msgstr "Geschlecht"
-
 #: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "eMail:"
 
-#: src/gui/register.cpp:152
-#, c-format
-msgid "RegisterDialog::register Username is %s"
-msgstr ""
-
 #: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
@@ -2172,12 +1342,12 @@ msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 msgid "The username needs to be less than %d characters long."
 msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:118
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Das Passwort muss aus mindestens %d bestehen."
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:125
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Das Passwort muss kürzer als %d Zeichen sein."
@@ -2186,152 +1356,49 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/sdlinput.cpp:79 src/gui/sdlinput.cpp:99
-msgid "The queue is empty."
-msgstr "Die Warteschlange ist leer."
-
-#: src/gui/sell.cpp:74 src/gui/sell.cpp:182
-msgid "sell"
-msgstr "Verkaufen"
-
-#: src/gui/serverdialog.cpp:87
+#: src/gui/serverdialog.cpp:134
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:94 src/gui/widgets/chattab.cpp:135
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:95
+#: src/gui/serverdialog.cpp:142
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:106 src/gui/serverdialog.cpp:228
-msgid "MostUsedServerName"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:109 src/gui/serverdialog.cpp:230
-msgid "MostUsedServerPort"
-msgstr ""
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:128
+#: src/gui/serverdialog.cpp:183
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:128 src/gui/serverdialog.cpp:131
-#: src/gui/serverdialog.cpp:132 src/gui/serverdialog.cpp:191
-msgid "connect"
-msgstr "Verbinde..."
-
-#: src/gui/serverdialog.cpp:129
-msgid "Add Entry"
-msgstr "Neuer Eintrag"
-
-#: src/gui/serverdialog.cpp:129 src/gui/serverdialog.cpp:249
-msgid "addEntry"
-msgstr ""
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/serverdialog.cpp:197
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:215
-msgid "MostUsedServerName0"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:216
-msgid "MostUsedServerPort0"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:411
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:302
+#: src/gui/serverdialog.cpp:417
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:306
+#: src/gui/serverdialog.cpp:421
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:343
-msgid "onlineServerList"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:343 src/gui/serverdialog.cpp:345
-msgid "void"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:362 src/main.cpp:565
-msgid "version"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:366
-msgid "Online server list has wrong version"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:376 src/gui/updatewindow.cpp:72
-#: src/resources/itemdb.cpp:143
-msgid "type"
-msgstr "Typ: "
-
-#: src/gui/serverdialog.cpp:376
-#, fuzzy
-msgid "unknown"
-msgstr "Unbekannter Gegenstand"
-
-#: src/gui/serverdialog.cpp:387
-msgid "connection"
-msgstr "Verbindung"
-
-#: src/gui/serverdialog.cpp:389
-msgid "manaserv"
-msgstr "manaserver"
-
-#: src/gui/serverdialog.cpp:393
-#, fuzzy
-msgid "eathena"
-msgstr "Erstellen"
-
-#: src/gui/serverdialog.cpp:401
-msgid "hostname"
-msgstr "Servername"
-
-#: src/gui/serverdialog.cpp:402 src/main.cpp:312 src/main.cpp:560
-msgid "port"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:448
-#, c-format
-msgid "Error retreiving server list: %s\n"
-msgstr "Fehler beim empfangen der Serverliste: %s\n"
-
-#: src/gui/setup_audio.cpp:38 src/gui/setup_audio.cpp:86
-#: src/gui/setup_audio.cpp:130 src/gui/setup_audio.cpp:142 src/main.cpp:324
-#: src/main.cpp:467
-msgid "musicVolume"
-msgstr "Lautstärke der Musik"
-
-#: src/gui/setup_audio.cpp:39 src/gui/setup_audio.cpp:85
-#: src/gui/setup_audio.cpp:129 src/gui/setup_audio.cpp:137 src/main.cpp:323
-#: src/main.cpp:465
-msgid "sfxVolume"
-msgstr "Lautstärke der Klangeffekte"
-
-#: src/gui/setup_audio.cpp:40 src/gui/setup_audio.cpp:88
-#: src/gui/setup_audio.cpp:127 src/main.cpp:320 src/main.cpp:462
-#: src/resources/itemdb.cpp:196 src/resources/monsterdb.cpp:99
-msgid "sound"
-msgstr "Ton"
-
-#: src/gui/setup_audio.cpp:41 src/gui/setup_audio.cpp:92
-#: src/gui/setup_audio.cpp:96 src/gui/setup_audio.cpp:128
-#: src/gui/updatewindow.cpp:459
-msgid "download-music"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ton"
@@ -2352,10 +1419,6 @@ msgstr "Lautstärke der Klangeffekte"
 msgid "Music volume"
 msgstr "Lautstärke der Musik"
 
-#: src/gui/setup_audio.cpp:53 src/gui/setup_audio.cpp:135
-msgid "sfx"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:94
 #, fuzzy
 msgid "Notice"
@@ -2371,88 +1434,58 @@ msgstr ""
 msgid "Sound Engine"
 msgstr "Soundengine"
 
-#: src/gui/setup_audio.cpp:107 src/main.cpp:474
-#, c-format
-msgid "Warning: %s"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr "So wird die Farbe aussehen"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "Farben"
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:70
 msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:75 src/gui/setup_colors.cpp:192
-msgid "slider_grad"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr "Statisch"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
 #: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "Pulsierend"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
 #: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "Regenbogen"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
 #: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:92
 msgid "Delay:"
 msgstr "Verzögerung: "
 
-#: src/gui/setup_colors.cpp:104 src/gui/setup_colors.cpp:199
-msgid "slider_graddelay"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:107
 msgid "Red:"
 msgstr "Rot: "
 
-#: src/gui/setup_colors.cpp:119 src/gui/setup_colors.cpp:206
-msgid "slider_red"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:122
 msgid "Green:"
 msgstr "Grün: "
 
-#: src/gui/setup_colors.cpp:134 src/gui/setup_colors.cpp:213
-msgid "slider_green"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:137
 msgid "Blue:"
 msgstr "Blau: "
 
-#: src/gui/setup_colors.cpp:149 src/gui/setup_colors.cpp:220
-msgid "slider_blue"
-msgstr ""
-
-#: src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62 src/gui/windowmenu.cpp:138
-#: src/main.cpp:879 src/main.cpp:1287
-msgid "Setup"
-msgstr "Einstellungen"
-
-#: src/gui/setup.cpp:51 src/gui/setup.cpp:101
+#: src/gui/setup.cpp:51
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:51 src/gui/setup.cpp:62 src/gui/setup.cpp:111
+#: src/gui/setup.cpp:51
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
@@ -2464,10 +1497,6 @@ msgstr "Knopf drücken um die Kalibrierung zu starten"
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
-#: src/gui/setup_joystick.cpp:38
-msgid "calibrate"
-msgstr "Kalibrieren"
-
 #: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
@@ -2476,10 +1505,6 @@ msgstr "Joystick aktivieren"
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:43 src/gui/setup_joystick.cpp:101
-msgid "joystickEnabled"
-msgstr "Joystick"
-
 #: src/gui/setup_joystick.cpp:83
 msgid "Stop"
 msgstr "Stopp"
@@ -2496,513 +1521,476 @@ msgstr "Tastatur"
 msgid "Assign"
 msgstr "Zuordnen"
 
-#: src/gui/setup_keyboard.cpp:86 src/gui/setup_keyboard.cpp:144
-msgid "assign"
-msgstr "Zuordnen"
-
 #: src/gui/setup_keyboard.cpp:90
 msgid "Default"
 msgstr "Standard"
 
-#: src/gui/setup_keyboard.cpp:90 src/gui/setup_keyboard.cpp:153
-msgid "makeDefault"
-msgstr "stelle Standardeinstellungen her"
-
 #: src/gui/setup_keyboard.cpp:119
-msgid "Key Conflict(s) Detected"
+#, fuzzy
+msgid "Key Conflict(s) Detected."
 msgstr "Tastenkonflikte entdeckt."
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
-
-#: src/gui/setup_keyboard.cpp:151
-msgid ": ?"
-msgstr ""
-
-#: src/gui/setup_keyboard.cpp:165 src/gui/widgets/chattab.cpp:127
-#: src/gui/widgets/chattab.cpp:131 src/gui/widgets/chattab.cpp:159
-msgid ": "
-msgstr ""
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Beziehung"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Freund"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "Unbeachtet"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:214
-msgid "table"
-msgstr ""
-
-#: src/gui/setup_players.cpp:215
-msgid "strategy"
-msgstr ""
-
-#: src/gui/setup_players.cpp:216
-msgid "whisper tab"
-msgstr "geflüsterte Nachricht"
-
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr "Alle privaten Nachrichten in Tabs öffnen"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "Geschlecht"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Spieler"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_video.cpp:94
-#, fuzzy
-msgid "No modes available"
-msgstr "Keine Server verfügbar"
-
-#: src/gui/setup_video.cpp:96
-msgid "All resolutions available"
-msgstr ""
-
-#: src/gui/setup_video.cpp:103 src/gui/setup_video.cpp:452
-#: src/gui/setup_video.cpp:453
-msgid "x"
-msgstr ""
-
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr "Winzig"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "Klein"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr "Groß"
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr "Kein Text"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Blasen, keine Namen"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr "Blasen mit Namen"
 
-#: src/gui/setup_video.cpp:152 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:414 src/gui/setup_video.cpp:528
-msgid "OverlayDetail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:156
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "Aus"
 
-#: src/gui/setup_video.cpp:157 src/gui/setup_video.cpp:170
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "Niedrig"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "Hoch"
 
-#: src/gui/setup_video.cpp:166 src/gui/setup_video.cpp:217
-#: src/gui/setup_video.cpp:534
-msgid "particleEmitterSkip"
-msgstr ""
-
-#: src/gui/setup_video.cpp:171 src/resources/monsterdb.cpp:70
-#: src/resources/monsterdb.cpp:75
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "Mittel"
 
-#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:344
-#: src/gui/setup_video.cpp:387 src/gui/setup_video.cpp:406
-#: src/gui/setup_video.cpp:433 src/main.cpp:319 src/main.cpp:438
-#, fuzzy
-msgid "screen"
-msgstr "Vollbild"
-
-#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:355
-#: src/gui/setup_video.cpp:393 src/gui/setup_video.cpp:415
-#: src/gui/setup_video.cpp:442 src/main.cpp:315 src/main.cpp:317
-#: src/main.cpp:423
-msgid "opengl"
-msgstr ""
-
-#: src/gui/setup_video.cpp:181 src/gui/setup_video.cpp:252
-#: src/gui/setup_video.cpp:407 src/gui/setup_video.cpp:434
-#: src/gui/setup_video.cpp:475 src/gui/setup_video.cpp:477 src/main.cpp:329
-msgid "customcursor"
-msgstr "Benutzerdefinierter Zeiger"
-
-#: src/gui/setup_video.cpp:182 src/gui/setup_video.cpp:253
-#: src/gui/setup_video.cpp:408 src/gui/setup_video.cpp:435
-#: src/gui/setup_video.cpp:479 src/gui/setup_video.cpp:481
-msgid "visiblenames"
-msgstr "Sichtbare Namen"
-
-#: src/gui/setup_video.cpp:183 src/gui/setup_video.cpp:254
-#: src/gui/setup_video.cpp:409 src/gui/setup_video.cpp:436
-#: src/gui/setup_video.cpp:483 src/gui/setup_video.cpp:485
-msgid "particleeffects"
-msgstr "Partikeleffekte"
-
-#: src/gui/setup_video.cpp:184 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:410 src/gui/setup_video.cpp:438
-#: src/gui/setup_video.cpp:511 src/gui/setup_video.cpp:517
-#: src/localplayer.cpp:126 src/localplayer.cpp:127 src/localplayer.cpp:135
-#: src/localplayer.cpp:1149 src/localplayer.cpp:1151
-msgid "showownname"
-msgstr "Zeige eigenen Namen"
-
-#: src/gui/setup_video.cpp:185 src/gui/setup_video.cpp:416
-#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:497
-#: src/localplayer.cpp:972 src/localplayer.cpp:979
-msgid "showpickupchat"
-msgstr "Benachrichtigung beim Aufheben"
-
-#: src/gui/setup_video.cpp:186 src/gui/setup_video.cpp:417
-#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:501
-#: src/localplayer.cpp:989
-#, fuzzy
-msgid "showpickupparticle"
-msgstr "als Partikeleffekt"
-
-#: src/gui/setup_video.cpp:187 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:413 src/gui/setup_video.cpp:441
-#: src/gui/setup_video.cpp:471 src/gui/setup_video.cpp:473 src/main.cpp:321
-msgid "guialpha"
-msgstr ""
-
-#: src/gui/setup_video.cpp:190 src/gui/setup_video.cpp:260
-#: src/gui/setup_video.cpp:412 src/gui/setup_video.cpp:437
-#: src/gui/setup_video.cpp:504 src/gui/setup_video.cpp:509
-msgid "speech"
-msgstr ""
+#: src/gui/setup_video.cpp:174
+msgid "max"
+msgstr "max"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Sichtbare Namen"
 
-#: src/gui/setup_video.cpp:199
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:204
 #, fuzzy
 msgid "Show own name"
 msgstr "Eigener Name"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
-#: src/gui/setup_video.cpp:204
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr "im Chatfenster"
 
-#: src/gui/setup_video.cpp:206
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:211
+#: src/gui/setup_video.cpp:214
 #, fuzzy
 msgid "FPS limit:"
 msgstr "FPS-Limit:"
 
-#: src/gui/setup_video.cpp:220 src/gui/setup_video.cpp:403
-#, fuzzy
-msgid "fontSize"
-msgstr "Schriftgröße"
-
-#: src/gui/setup_video.cpp:222
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Video"
 
 #: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "Eigener Name"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:236
 #, fuzzy
 msgid "Particle detail"
 msgstr "Partikeldetail"
 
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:449
-#, fuzzy
-msgid "videomode"
-msgstr " Auflösung: "
-
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:495
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
 #, fuzzy
-msgid "pickupchat"
-msgstr "Aufheben"
-
-#: src/gui/setup_video.cpp:256 src/gui/setup_video.cpp:499
-#, fuzzy
-msgid "pickupparticle"
-msgstr "als Partikeleffekt"
-
-#: src/gui/setup_video.cpp:259 src/gui/setup_video.cpp:537
-msgid "fpslimitcheckbox"
-msgstr ""
-
-#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:519
-msgid "fpslimitslider"
-msgstr ""
-
-#: src/gui/setup_video.cpp:262 src/gui/setup_video.cpp:524
-msgid "overlaydetailslider"
-msgstr ""
-
-#: src/gui/setup_video.cpp:263
-msgid "overlaydetailfield"
-msgstr ""
-
-#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:530
-#, fuzzy
-msgid "particledetailslider"
-msgstr "Partikeldetail"
-
-#: src/gui/setup_video.cpp:265
-#, fuzzy
-msgid "particledetailfield"
-msgstr "Partikeldetail"
+msgid "None"
+msgstr "Nein"
 
-#: src/gui/setup_video.cpp:366
+#: src/gui/setup_video.cpp:381
 #, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:387
 #, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_video.cpp:383
+#: src/gui/setup_video.cpp:398
 #, fuzzy
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:411
 #, fuzzy
 msgid "Changing to OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:397
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:459 src/gui/setup_video.cpp:464
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
 #, fuzzy
 msgid "Screen Resolution Changed"
 msgstr "Auflösung geändert"
 
-#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:465
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
-#: src/gui/setup_video.cpp:462
+#: src/gui/setup_video.cpp:489
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
 "anzupassen."
 
-#: src/gui/setup_video.cpp:468 src/main.cpp:435 src/main.cpp:884
-msgid "screenwidth"
-msgstr ""
-
-#: src/gui/setup_video.cpp:469 src/main.cpp:436 src/main.cpp:886
-#, fuzzy
-msgid "screenheight"
-msgstr "Bildschirmfoto"
-
-#: src/gui/setup_video.cpp:491
+#: src/gui/setup_video.cpp:522
 #, fuzzy
 msgid "Particle Effect Settings Changed."
 msgstr "Partikeleffekteinstellungen geändert."
 
-#: src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:523
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/skilldialog.cpp:85 src/gui/skilldialog.cpp:87
-#: src/gui/windowmenu.cpp:58 src/gui/windowmenu.cpp:122
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:141
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr "Erhöhen"
+
+#: src/gui/skilldialog.cpp:262
 #, fuzzy, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/skilldialog.cpp:173
-#, fuzzy
-msgid "skills"
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Fähigkeitspunkte: %d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
 msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:175
+#: src/gui/skilldialog.cpp:405
 #, fuzzy, c-format
-msgid "Error loading skills file: %s"
-msgstr "Fehler beim Laden von %s"
+msgid "Lvl: %d (%+d)"
+msgstr "Stufe: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Stufe: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, fuzzy, c-format
+msgid "Invited user %s to guild %s."
+msgstr "Spieler %s einladen"
 
-#: src/gui/skilldialog.cpp:186 src/gui/specialswindow.cpp:170
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gilde %s wurde aufgelöst."
+
+#: src/gui/socialwindow.cpp:136
 #, fuzzy
-msgid "set"
-msgstr "Zurücksetzten"
+msgid "Member Invite to Guild"
+msgstr "Spieler einladen"
 
-#: src/gui/skilldialog.cpp:189
+#: src/gui/socialwindow.cpp:137
 #, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Fähigkeitspunkte: %d"
+msgid "Who would you like to invite to guild %s?"
+msgstr "Wen möchtest du einladen?"
 
-#: src/gui/skilldialog.cpp:201
+#: src/gui/socialwindow.cpp:146
 #, fuzzy
-msgid "skill"
-msgstr "Fertigkeiten"
+msgid "Leave Guild?"
+msgstr "Gilde erstellen"
 
-#: src/gui/skilldialog.cpp:203 src/gui/specialswindow.cpp:187
-#: src/resources/itemdb.cpp:131 src/resources/monsterdb.cpp:131
-#: src/resources/monsterdb.cpp:144
-msgid "id"
-msgstr ""
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/gui/skilldialog.cpp:204
+#: src/gui/socialwindow.cpp:182
 #, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Fertigkeiten"
+msgid "Invited user %s to party."
+msgstr "Spieler %s einladen"
 
-#: src/gui/skilldialog.cpp:205 src/gui/specialswindow.cpp:191
-msgid "icon"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:240 src/gui/specialswindow.cpp:212
-msgid "999"
-msgstr ""
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "Spieler einladen"
 
-#: src/gui/skilldialog.cpp:252 src/gui/specialswindow.cpp:222
-msgid "graphics/gui/unknown-item.png"
+#: src/gui/socialwindow.cpp:200
+#, fuzzy, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "Wen möchtest du einladen?"
+
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/socialwindow.cpp:210
 #, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
+msgid "Are you sure you want to leave party %s?"
+msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "Gilde erstellen"
+
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Charakter erstellen"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#, fuzzy
+msgid "Social"
+msgstr "Special"
+
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "einladen"
+
+#: src/gui/socialwindow.cpp:298
+#, fuzzy
+msgid "Leave"
 msgstr "Stufe: %d"
 
-#: src/gui/skilldialog.cpp:320
+#: src/gui/socialwindow.cpp:394
 #, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Stufe: %d"
+msgid "Accepted party invite from %s."
+msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/skilldialog.cpp:326 src/resources/itemdb.cpp:169
-#: src/resources/itemdb.cpp:177 src/resources/itemdb.cpp:182
-msgid " / "
-msgstr ""
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/specialswindow.cpp:84 src/gui/specialswindow.cpp:86
-#: src/gui/windowmenu.cpp:59 src/gui/windowmenu.cpp:126
-msgid "Specials"
-msgstr "Special"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/specialswindow.cpp:157
-msgid "specials"
-msgstr ""
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Partyeinladung von %s abgelehnt."
+
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
+msgstr "Erstelle der Gilde %s."
 
-#: src/gui/specialswindow.cpp:159
+#: src/gui/socialwindow.cpp:477
 #, fuzzy, c-format
-msgid "Error loading specials file: %s"
-msgstr "Fehler beim Laden von %s"
+msgid "Creating party called %s."
+msgstr "Erstelle der Gilde %s."
+
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
+msgstr "Gildenname"
+
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
+msgstr "Wähle den Namen deiner Gilde"
+
+#: src/gui/socialwindow.cpp:497
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/specialswindow.cpp:173
+#: src/gui/socialwindow.cpp:502
 #, c-format
-msgid "Specials Set %d"
+msgid "%s has invited you to join the guild %s."
+msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr "Nehme Gildeneinladung an"
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
+
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s hat dich in seine Party eingeladen."
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
+
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s hat dich in seine Party eingeladen."
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr "Nehme Partyeinladung an"
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:185
-msgid "special"
+#: src/gui/socialwindow.cpp:570
+#, fuzzy
+msgid "Party Name"
+msgstr "Party"
+
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Wähle den Namen deiner Gilde"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr "Special"
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:190
+#: src/gui/specialswindow.cpp:191
 #, c-format
 msgid "Special %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:87 src/gui/windowmenu.cpp:55
-#: src/gui/windowmenu.cpp:110
-msgid "Status"
-msgstr "Status"
-
 #: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
 #, c-format
 msgid "Level: %d"
@@ -3034,10 +2022,6 @@ msgstr "Job: %d"
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:161 src/gui/statuswindow.cpp:166 src/main.cpp:686
-msgid "C"
-msgstr ""
-
 #: src/gui/statuswindow.cpp:194
 #, fuzzy
 msgid "HP"
@@ -3078,86 +2062,58 @@ msgstr "Fähigkeitspunkte: %d"
 msgid "Level"
 msgstr "Stufe: %d"
 
-#: src/gui/statuswindow.cpp:416
-#, c-format
-msgid "%2.2f"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:416
-msgid "%"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:456
-#, fuzzy, c-format
-msgid " (%+d)"
-msgstr "HP %+d"
-
-#: src/gui/storagewindow.cpp:55 src/gui/storagewindow.cpp:59
+#: src/gui/storagewindow.cpp:58
 msgid "Storage"
 msgstr "Lager"
 
-#: src/gui/textdialog.cpp:37 src/gui/textdialog.cpp:77
-msgid "CANCEL"
-msgstr ""
-
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr "Bestätigt. Warten..."
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr "Handel zustimmen"
 
-#: src/gui/trade.cpp:56
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr "Zugestimmt. Warten..."
 
-#: src/gui/trade.cpp:59
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "Handel: Du"
 
-#: src/gui/trade.cpp:66 src/gui/trade.cpp:75 src/gui/trade.cpp:76
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/trade.cpp:78
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:78 src/gui/trade.cpp:257
-#, fuzzy
-msgid "add"
-msgstr "Hinzufügen"
-
-#: src/gui/trade.cpp:100 src/gui/trade.cpp:136
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, fuzzy, c-format
 msgid "You get %s"
 msgstr "Du erhältst %s."
 
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:105
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Ändern"
 
-#: src/gui/trade.cpp:105 src/gui/trade.cpp:310
-#, fuzzy
-msgid "money"
-msgstr "Gefühle"
-
-#: src/gui/trade.cpp:276
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
-#: src/gui/trade.cpp:319
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
@@ -3166,93 +2122,34 @@ msgstr "Du hast nicht genügend Geld."
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/unregisterdialog.cpp:105
-#, c-format
-msgid "UnregisterDialog::unregistered, Username is %s"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:57
-msgid "updates"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:59 src/gui/updatewindow.cpp:114
-#, fuzzy, c-format
-msgid "Error loading update file: %s"
-msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-
-#: src/gui/updatewindow.cpp:66
-msgid "update"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:70
-#, fuzzy
-msgid "file"
-msgstr "Grinsen"
-
-#: src/gui/updatewindow.cpp:71
-msgid "hash"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:72 src/gui/updatewindow.cpp:105 src/main.cpp:388
-#: src/main.cpp:402 src/main.cpp:553
-msgid "data"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:73 src/resources/itemdb.cpp:149
-#, fuzzy
-msgid "description"
-msgstr "Beschreibung: %s"
-
-#: src/gui/updatewindow.cpp:74
-msgid "required"
-msgstr ""
-
 #: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updatewindow.cpp:128
-msgid "news.txt"
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Verbinde..."
 
 #: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updatewindow.cpp:145 src/gui/updatewindow.cpp:221
-#, fuzzy
-msgid "play"
-msgstr "Los!"
-
-#: src/gui/updatewindow.cpp:254
-#, fuzzy
-msgid "Couldn't load news"
-msgstr "Karte konnte nicht geladen werden"
-
-#: src/gui/updatewindow.cpp:399
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
-#: src/gui/updatewindow.cpp:401
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
-#: src/gui/updatewindow.cpp:403
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
 #, fuzzy
 msgid "##1  you try again later."
 msgstr "##1 es später erneut zu versuchen."
 
-#: src/gui/updatewindow.cpp:430
-#, c-format
-msgid "Warning this server does not have a %s file falling back to %s"
-msgstr "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
-
-#: src/gui/updatewindow.cpp:482
-#, c-format
-msgid "%s already here"
-msgstr "%s ist bereits hier"
-
-#: src/gui/updatewindow.cpp:495
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Fertig"
 
@@ -3276,11 +2173,6 @@ msgstr "/op > Ernenne einen Spieler zum Kanalwärter"
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > Werfe einen Spieler aus dem Kanal"
 
-#: src/gui/widgets/channeltab.cpp:61 src/gui/widgets/channeltab.cpp:97
-#, fuzzy
-msgid "users"
-msgstr "benutze"
-
 #: src/gui/widgets/channeltab.cpp:63
 msgid "Command: /users"
 msgstr "Befehl: /users"
@@ -3289,12 +2181,6 @@ msgstr "Befehl: /users"
 msgid "This command shows the users in this channel."
 msgstr "Dieser Befehl zeit eine Liste der Spieler im aktuellen Kanal."
 
-#: src/gui/widgets/channeltab.cpp:66 src/gui/widgets/channeltab.cpp:101
-#: src/gui/widgets/channeltab.cpp:105
-#, fuzzy
-msgid "topic"
-msgstr "Stopp"
-
 #: src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
 msgstr "Befehl: /topic <Thema>"
@@ -3315,11 +2201,6 @@ msgstr "Mit diesem Befehl verlässt Du den aktuellen Kanal"
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "Wenn Du die letzte Person im Kanal bist, wird dieser gelöscht."
 
-#: src/gui/widgets/channeltab.cpp:78 src/gui/widgets/channeltab.cpp:113
-#, fuzzy
-msgid "op"
-msgstr "Geschäft"
-
 #: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "Befehl: /op <Name>"
@@ -3334,12 +2215,6 @@ msgstr ""
 "Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
 "Moderator-Rechte verleihen."
 
-#: src/gui/widgets/channeltab.cpp:87 src/gui/widgets/channeltab.cpp:121
-#: src/net/ea/gui/partytab.cpp:125
-#, fuzzy
-msgid "kick"
-msgstr "Aufheben"
-
 #: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "Befehl: /kick <Name>"
@@ -3356,118 +2231,66 @@ msgstr "Gib einen Spieler an, der Moderator werden soll!"
 msgid "Need a user to kick!"
 msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
 
-#: src/gui/widgets/chattab.cpp:51 src/main.cpp:330
-msgid "ChatLogLength"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:92
-msgid "Welcome"
-msgstr "Wilkommen"
-
-#: src/gui/widgets/chattab.cpp:108 src/gui/widgets/chattab.cpp:132
-msgid "##C"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Globale Ansage:"
 
-#: src/gui/widgets/chattab.cpp:116
-msgid "##G"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale Ansage von %s:"
 
-#: src/gui/widgets/chattab.cpp:123
-msgid "##1"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:128
-msgid "##Y"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:138 src/gui/widgets/chattab.cpp:162
-msgid "##S"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:143
-msgid "##2"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, fuzzy, c-format
 msgid "%s whispers: %s"
 msgstr "%s flüstert: "
 
-#: src/gui/widgets/chattab.cpp:147
-msgid "##W"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:150
-msgid "##I"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:155
-msgid "##L"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:235
-msgid "|"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:50
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr "Kann keine leere Nachricht senden!"
 
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:70
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:71
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr "/close > Schließe einen privaten Tab"
 
-#: src/gui/widgets/whispertab.cpp:81
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr "Befehl: /close"
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
 
-#: src/gui/widgets/whispertab.cpp:86
+#: src/gui/widgets/whispertab.cpp:87
 #, fuzzy
 msgid "Command: /ignore"
 msgstr "Befehl: /item"
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:88
 #, fuzzy
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/gui/widgets/whispertab.cpp:93
+#: src/gui/widgets/whispertab.cpp:94
 #, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
 "<Dateiname>."
 
-#: src/gui/windowmenu.cpp:54 src/gui/windowmenu.cpp:89
-msgid ":-)"
-msgstr ":-)"
-
-#: src/gui/windowmenu.cpp:60 src/gui/windowmenu.cpp:130
-msgid "Guilds"
-msgstr "Gilden"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61 src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
@@ -3486,1043 +2309,287 @@ msgstr "Ändern"
 msgid "Choose World"
 msgstr "Wähle deinen Server"
 
-#: src/gui/worldselectdialog.cpp:77 src/gui/worldselectdialog.cpp:111
-#, fuzzy
-msgid "world"
-msgstr "Schwertpolarm"
-
-#: src/keyboardconfig.cpp:41
-#, fuzzy
-msgid "keyMoveUp"
-msgstr "Laufe Hoch"
-
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr "Laufe Hoch"
 
-#: src/keyboardconfig.cpp:42
-#, fuzzy
-msgid "keyMoveDown"
-msgstr "Laufe Runter"
-
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr "Laufe Runter"
 
-#: src/keyboardconfig.cpp:43
-#, fuzzy
-msgid "keyMoveLeft"
-msgstr "Laufe nach Links"
-
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr "Laufe nach Links"
 
-#: src/keyboardconfig.cpp:44
-#, fuzzy
-msgid "keyMoveRight"
-msgstr "Laufe nach Rechts"
-
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr "Laufe nach Rechts"
 
-#: src/keyboardconfig.cpp:45
-#, fuzzy
-msgid "keyAttack"
-msgstr "Angriff"
-
-#: src/keyboardconfig.cpp:45 src/net/ea/generalhandler.cpp:216
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr "Angriff"
 
-#: src/keyboardconfig.cpp:46
-#, fuzzy
-msgid "keyTargetAttack"
-msgstr "Zielen & Angreifen"
-
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr "Zielen & Angreifen"
 
-#: src/keyboardconfig.cpp:47
-#, fuzzy
-msgid "keySmilie"
-msgstr "Grinsen"
-
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr "Grinsen"
 
-#: src/keyboardconfig.cpp:48
-#, fuzzy
-msgid "keyTalk"
-msgstr "Sprechen"
-
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr "Sprechen"
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "keyTarget"
-msgstr "NPC anvisieren"
-
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:49
 #, fuzzy
-msgid "keyTargetClosest"
+msgid "Target Monster"
 msgstr "Nächstes Ziel anvisieren"
 
 #: src/keyboardconfig.cpp:50
-msgid "Target Closest"
-msgstr "Nächstes Ziel anvisieren"
-
-#: src/keyboardconfig.cpp:51
-#, fuzzy
-msgid "keyTargetNPC"
-msgstr "NPC anvisieren"
-
-#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr "NPC anvisieren"
 
-#: src/keyboardconfig.cpp:52
-#, fuzzy
-msgid "keyTargetPlayer"
-msgstr "Spieler anvisieren"
-
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr "Spieler anvisieren"
 
-#: src/keyboardconfig.cpp:53
-#, fuzzy
-msgid "keyPickup"
-msgstr "Aufheben"
-
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: src/keyboardconfig.cpp:54
-#, fuzzy
-msgid "keyHideWindows"
-msgstr "Fenster ausblenden"
-
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr "Fenster ausblenden"
 
-#: src/keyboardconfig.cpp:55
-#, fuzzy
-msgid "keyBeingSit"
-msgstr "Aktionen"
-
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr "Sitzen"
 
-#: src/keyboardconfig.cpp:56
-#, fuzzy
-msgid "keyScreenshot"
-msgstr "Bildschirmfoto"
-
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: src/keyboardconfig.cpp:57
-#, fuzzy
-msgid "keyTrade"
-msgstr "Handeln"
-
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/keyboardconfig.cpp:58
-msgid "keyPathfind"
-msgstr ""
-
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr "Finde Weg zum Mauszeiger"
 
-#: src/keyboardconfig.cpp:59
-#, fuzzy
-msgid "keyShortcut1"
-msgstr "Tastenkürzel"
-
-#: 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
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Kurztaste %d"
 
-#: src/keyboardconfig.cpp:60
-#, fuzzy
-msgid "keyShortcut2"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:61
-#, fuzzy
-msgid "keyShortcut3"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:62
-#, fuzzy
-msgid "keyShortcut4"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:63
-#, fuzzy
-msgid "keyShortcut5"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:64
-#, fuzzy
-msgid "keyShortcut6"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:65
-#, fuzzy
-msgid "keyShortcut7"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:66
-#, fuzzy
-msgid "keyShortcut8"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:67
-#, fuzzy
-msgid "keyShortcut9"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:68
-#, fuzzy
-msgid "keyShortcut10"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:69
-#, fuzzy
-msgid "keyShortcut11"
-msgstr "Tastenkürzel"
-
 #: src/keyboardconfig.cpp:70
-#, fuzzy
-msgid "keyShortcut12"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:71
-msgid "keyWindowHelp"
-msgstr ""
-
-#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr "Hilfefenster"
 
-#: src/keyboardconfig.cpp:72
-msgid "keyWindowStatus"
-msgstr ""
-
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:73
-#, fuzzy
-msgid "keyWindowInventory"
-msgstr "Inventar"
-
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
-#: src/keyboardconfig.cpp:74
-#, fuzzy
-msgid "keyWindowEquipment"
-msgstr "Ausrüstung"
-
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
-#: src/keyboardconfig.cpp:75
-#, fuzzy
-msgid "keyWindowSkill"
-msgstr "Unbekannte Fähigkeit"
-
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:76
-msgid "keyWindowMinimap"
-msgstr ""
-
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
-#: src/keyboardconfig.cpp:77
-msgid "keyWindowChat"
-msgstr ""
-
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr "Chatfenster"
 
-#: src/keyboardconfig.cpp:78
-#, fuzzy
-msgid "keyWindowShortcut"
-msgstr "Tastenkürzel"
-
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
-#: src/keyboardconfig.cpp:79
-msgid "keyWindowSetup"
-msgstr ""
-
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr "Einstellungen"
 
-#: src/keyboardconfig.cpp:80
-msgid "keyWindowDebug"
-msgstr ""
-
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr "Debugfenster"
 
-#: src/keyboardconfig.cpp:81
-msgid "keyWindowParty"
-msgstr ""
+#: src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Social Window"
+msgstr "Fertigkeitenfenster"
 
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr "Partyfenster"
-
-#: src/keyboardconfig.cpp:82
-msgid "keyWindowEmoteBar"
-msgstr ""
-
-#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:83
-msgid "keyWindowOutfit"
-msgstr ""
-
-#: src/keyboardconfig.cpp:83
+#: src/keyboardconfig.cpp:82
 #, fuzzy
 msgid "Outfits Window"
 msgstr "Statusfenster"
 
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
 #: src/keyboardconfig.cpp:84
-#, fuzzy
-msgid "keyEmoteShortcut1"
-msgstr "Gefühlstaste %d"
+msgid "Copy Outfit"
+msgstr ""
 
-#: 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 src/keyboardconfig.cpp:95
+#: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:85
-#, fuzzy
-msgid "keyEmoteShortcut2"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:86
-#, fuzzy
-msgid "keyEmoteShortcut3"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:87
-#, fuzzy
-msgid "keyEmoteShortcut4"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:88
-#, fuzzy
-msgid "keyEmoteShortcut5"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:89
-#, fuzzy
-msgid "keyEmoteShortcut6"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:90
-#, fuzzy
-msgid "keyEmoteShortcut7"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:91
-#, fuzzy
-msgid "keyEmoteShortcut8"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:92
-#, fuzzy
-msgid "keyEmoteShortcut9"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:93
-#, fuzzy
-msgid "keyEmoteShortcut10"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:94
-#, fuzzy
-msgid "keyEmoteShortcut11"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:95
-#, fuzzy
-msgid "keyEmoteShortcut12"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:96
-#, fuzzy
-msgid "keyChat"
-msgstr "Chat"
-
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:97
-msgid "keyChatScrollUp"
-msgstr ""
-
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:98
-#, fuzzy
-msgid "keyChatScrollDown"
-msgstr "Im Chat runter scrollen"
-
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:99
-msgid "keyChatPrevTab"
-msgstr ""
-
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:100
-msgid "keyChatNextTab"
-msgstr ""
-
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:101
-msgid "keyOK"
-msgstr ""
-
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr "OK auswählen"
 
-#: src/keyboardconfig.cpp:102
-#, fuzzy
-msgid "keyQuit"
-msgstr "Beenden"
-
-#: src/keyboardconfig.cpp:103
-#, fuzzy
-msgid "keyIgnoreInput1"
-msgstr "Ignoriere Eingabe 1"
-
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:104
-#, fuzzy
-msgid "keyIgnoreInput2"
-msgstr "Ignoriere Eingabe 2"
-
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/localplayer.cpp:695
-#, c-format
-msgid "SpecialUpdate Skill #%d -- (%d/%d) -> %d"
-msgstr ""
-
-#: src/localplayer.cpp:782
-msgid "sfx/fist-swish.ogg"
-msgstr ""
-
-#: src/localplayer.cpp:888
-#, c-format
-msgid "%d %s xp"
-msgstr ""
-
-#: src/localplayer.cpp:928
-msgid " xp"
-msgstr ""
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
-#: src/localplayer.cpp:974
+#: src/localplayer.cpp:913
 msgid "Unable to pick up item."
 msgstr "Kann das nicht aufheben."
 
-#: src/localplayer.cpp:983 src/localplayer.cpp:984
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
-msgstr "Du hast %s [@@%d|%s@@] aufgehoben."
-
-#: src/localplayer.cpp:1093
-msgid "graphics/gui/target-cursor-blue-s.png"
-msgstr ""
-
-#: src/localplayer.cpp:1095
-msgid "graphics/gui/target-cursor-red-s.png"
-msgstr ""
-
-#: src/localplayer.cpp:1097
-msgid "graphics/gui/target-cursor-blue-m.png"
-msgstr ""
-
-#: src/localplayer.cpp:1099
-msgid "graphics/gui/target-cursor-red-m.png"
-msgstr ""
-
-#: src/localplayer.cpp:1101
-msgid "graphics/gui/target-cursor-blue-l.png"
-msgstr ""
-
-#: src/localplayer.cpp:1103
-msgid "graphics/gui/target-cursor-red-l.png"
-msgstr ""
-
-#: src/main.cpp:202 src/main.cpp:328
-#, fuzzy
-msgid "updatehost"
-msgstr "Ungültiger Updateserver: "
-
-#: src/main.cpp:202
-msgid "http://updates.themanaworld.org/"
-msgstr ""
-
-#: src/main.cpp:211
-msgid "://"
-msgstr ""
-
-#: src/main.cpp:216 src/main.cpp:229
-msgid "updates/"
-msgstr ""
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
+msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
 
-#: src/main.cpp:221
-#, fuzzy, c-format
-msgid "Error: Invalid update host: %s"
-msgstr "Ungültiger Updateserver: "
-
-#: src/main.cpp:222
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Ungültiger Updateserver: "
-
-#: src/main.cpp:228
-msgid "Warning: no protocol was specified for the update host"
-msgstr ""
-
-#: src/main.cpp:241 src/main.cpp:246
-msgid "\\"
-msgstr ""
-
-#: src/main.cpp:253
-#, fuzzy, c-format
-msgid "Error: %s can't be made, but doesn't exist!"
-msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
-
-#: src/main.cpp:255 src/main.cpp:261
-msgid "Error creating updates directory!"
-msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-
-#: src/main.cpp:259
-#, fuzzy, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
-msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
-
-#: src/main.cpp:281
-msgid "/Library/Application Support/"
-msgstr ""
-
-#: src/main.cpp:282 src/main.cpp:371
-#, fuzzy
-msgid "appName"
-msgstr "Name"
-
-#: src/main.cpp:282
-#, fuzzy
-msgid "Mana"
-msgstr "Mana"
-
-#: src/main.cpp:285
-msgid "/."
-msgstr ""
-
-#: src/main.cpp:285
-#, fuzzy
-msgid "appShort"
-msgstr "Tastenkürzel"
-
-#: src/main.cpp:285 src/main.cpp:520 src/main.cpp:694 src/main.cpp:696
-#: src/main.cpp:699 src/main.cpp:700
-msgid "mana"
-msgstr "mana"
-
-#: src/main.cpp:297
-#, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
-
-#: src/main.cpp:308
-msgid "Initializing configuration..."
-msgstr ""
-
-#: src/main.cpp:309 src/main.cpp:787
-#, fuzzy
-msgid "defaultServer"
-msgstr "Server auswählen"
-
-#: src/main.cpp:310 src/main.cpp:788
-msgid "server.themanaworld.org"
-msgstr ""
-
-#: src/main.cpp:311 src/main.cpp:791
-#, fuzzy
-msgid "defaultPort"
-msgstr "Standard"
-
-#: src/main.cpp:313 src/main.cpp:439
-#, fuzzy
-msgid "hwaccel"
-msgstr "Abbrechen"
-
-#: src/main.cpp:322 src/main.cpp:683 src/main.cpp:783
-msgid "remember"
-msgstr ""
-
-#: src/main.cpp:326
-msgid "defaultUpdateHost"
-msgstr ""
-
-#: src/main.cpp:327
-msgid "http://updates.themanaworld.org"
-msgstr ""
-
-#: src/main.cpp:340
-msgid "r"
-msgstr ""
-
-#: src/main.cpp:345
-msgid "wt"
-msgstr ""
-
-#: src/main.cpp:348
-#, fuzzy, c-format
-msgid "Can't create %s. Using defaults."
-msgstr "Chat-Erstellung fehlgeschlagen!"
-
-#: src/main.cpp:361
-msgid "Initializing SDL..."
-msgstr ""
-
-#: src/main.cpp:363
-#, c-format
-msgid "Could not initialize SDL: %s"
-msgstr ""
-
-#: src/main.cpp:371
-#, fuzzy
-msgid "The Mana World"
-msgstr "The Mana World %s"
-
-#: src/main.cpp:377
-#, c-format
-msgid "%s couldn't be set as home directory! Exiting."
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:396
-#, c-format
-msgid "Can't find Resources directory\n"
-msgstr "Kann das Ressourcen Verzeichnis nicht finden\n"
-
-#: src/main.cpp:399
-msgid "/data"
-msgstr ""
-
-#: src/main.cpp:408
-msgid "A"
-msgstr ""
-
-#: src/main.cpp:414
-msgid "appIcon"
-msgstr ""
-
-#: src/main.cpp:414
-msgid "data/icons/mana.png"
-msgstr ""
-
-#: src/main.cpp:444
-#, c-format
-msgid "Couldn't set %dx%dx%d video mode: %s"
-msgstr "Kann Videomodus %dx%dx%d nicht setzten: %s"
-
-#: src/main.cpp:521
+#: src/main.cpp:44
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:522
-msgid "  -C --config-file    : Configuration file to use"
-msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
-
-#: src/main.cpp:523
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
-
-#: src/main.cpp:524
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:526
+#: src/main.cpp:46
 msgid "  -h --help           : Display this help"
 msgstr "  - --help : Zeigt diesen Hilfstext an"
 
-#: src/main.cpp:527
-msgid "  -S --home-dir       : Directory to use as home directory"
-msgstr ""
-"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
-
-#: src/main.cpp:528
-msgid "  -i --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
+#: src/main.cpp:47
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
 
-#: src/main.cpp:529
-msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host : Benutze angegebenen Updateserver"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:530
+#: src/main.cpp:49
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:531
+#: src/main.cpp:50
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:532
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Port des Loginservers"
-
-#: src/main.cpp:533
+#: src/main.cpp:51
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
 
-#: src/main.cpp:534
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
-
-#: src/main.cpp:535
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
-
-#: src/main.cpp:537
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
-
-#: src/main.cpp:539
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Die Version des Spieles anzeigen"
-
-#: src/main.cpp:544
-#, c-format
-msgid "The Mana World %s"
-msgstr "The Mana World %s"
-
-#: src/main.cpp:549
-msgid "hvud:U:P:Dc:s:p:C:H:S:Oi:"
-msgstr ""
-
-#: src/main.cpp:552
-msgid "config-file"
-msgstr ""
-
-#: src/main.cpp:554
-msgid "default"
-msgstr "Standard"
-
-#: src/main.cpp:555
-msgid "password"
-msgstr "Passwort:"
-
-#: src/main.cpp:556
-msgid "character"
-msgstr "Spielfigur"
-
-#: src/main.cpp:558
-msgid "home-dir"
-msgstr ""
-
-#: src/main.cpp:559
-msgid "update-host"
-msgstr "Updateserver: "
-
-#: src/main.cpp:562
-msgid "skip-update"
-msgstr ""
-
-#: src/main.cpp:563 src/main.cpp:681 src/main.cpp:795
-msgid "username"
-msgstr "Benutztername"
-
-#: src/main.cpp:564
-msgid "no-opengl"
-msgstr ""
-
-#: src/main.cpp:566
-msgid "screenshot-dir"
-msgstr "Bildschirmfotoordner"
-
-#: src/main.cpp:663 src/main.cpp:1134
-#, c-format
-msgid "Username is %s"
-msgstr "Benutzername ist %s"
-
-#: src/main.cpp:692
-msgid "LANG="
-msgstr ""
-
-#: src/main.cpp:699
-msgid "UTF-8"
-msgstr ""
-
-#: src/main.cpp:756
-#, c-format
-msgid "Mana %s"
-msgstr "Mana: %s"
-
-#: src/main.cpp:759
-msgid "logToStandardOut"
-msgstr ""
-
-#: src/main.cpp:775
-msgid "loginMusic"
-msgstr "Loginmusik"
-
-#: src/main.cpp:775
-msgid "Magick - Real.ogg"
-msgstr ""
-
-#: src/main.cpp:914
-msgid "State: CHOOSE SERVER"
-msgstr ""
-
-#: src/main.cpp:937
-msgid "State: CONNECT SERVER"
-msgstr ""
-
-#: src/main.cpp:942
-msgid "State: LOGIN"
-msgstr ""
-
-#: src/main.cpp:959
-msgid "State: LOGIN ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:964
-msgid "State: WORLD SELECT"
-msgstr ""
-
-#: src/main.cpp:991
-msgid "State: WORLD SELECT ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1010
-msgid "State: UPDATE"
-msgstr ""
-
-#: src/main.cpp:1017
-msgid "State: LOAD DATA"
-msgstr ""
-
-#: src/main.cpp:1025
-msgid "customdata/"
-msgstr ""
-
-#: src/main.cpp:1026
-msgid "zip"
-msgstr ""
-
-#: src/main.cpp:1046
-msgid "State: GET CHARACTERS"
-msgstr ""
-
-#: src/main.cpp:1051
-msgid "State: CHAR SELECT"
-msgstr ""
-
-#: src/main.cpp:1064 src/main.cpp:1079
-msgid "lastCharacter"
-msgstr "letzter Charakter"
-
-#: src/main.cpp:1070
-msgid "State: CONNECT GAME"
-msgstr ""
-
-#: src/main.cpp:1077
-#, c-format
-msgid "Memorizing selected character %s"
-msgstr "Speichere den gewählten Charakter %s"
-
-#: src/main.cpp:1097
-msgid "State: GAME"
-msgstr ""
-
-#: src/main.cpp:1109
-msgid "State: LOGIN ERROR"
-msgstr ""
-
-#: src/main.cpp:1116
-msgid "State: ACCOUNT CHANGE ERROR"
-msgstr ""
-
-#: src/main.cpp:1123
-msgid "State: REGISTER_PREP"
-msgstr ""
-
-#: src/main.cpp:1129
-msgid "State: REGISTER"
-msgstr ""
-
-#: src/main.cpp:1141
-msgid "State: CHANGE PASSWORD"
-msgstr ""
-
-#: src/main.cpp:1146
-msgid "State: CHANGE PASSWORD ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1153
-msgid "State: CHANGE PASSWORD SUCCESS"
-msgstr ""
-
-#: src/main.cpp:1154
-msgid "Password Change"
-msgstr "Passwort ändern:"
-
-#: src/main.cpp:1155
-msgid "Password changed successfully!"
-msgstr "Passwort erfolgreich geändert!"
-
-#: src/main.cpp:1163
-msgid "State: CHANGE EMAIL"
-msgstr ""
-
-#: src/main.cpp:1168
-msgid "State: CHANGE EMAIL ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1173
-msgid "State: CHANGE EMAIL SUCCESS"
-msgstr ""
-
-#: src/main.cpp:1174
-msgid "Email Change"
-msgstr "E-Mail ändern"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Port des Loginservers"
 
-#: src/main.cpp:1175
+#: src/main.cpp:53
 #, fuzzy
-msgid "Email changed successfully!"
-msgstr "Mitglied wurde erfolgreich Befördert."
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Benutze angegebenen Updateserver"
 
-#: src/main.cpp:1181
-msgid "State: UNREGISTER"
-msgstr ""
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:1186
-msgid "State: UNREGISTER ATTEMPT"
-msgstr ""
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
 
-#: src/main.cpp:1192
-msgid "State: UNREGISTER SUCCESS"
-msgstr ""
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
-#: src/main.cpp:1195
+#: src/main.cpp:58
 #, fuzzy
-msgid "Unregister Successful"
-msgstr "Abmelden"
-
-#: src/main.cpp:1196
-msgid "Farewell, come back any time..."
-msgstr "Leb wohl und komme jeder Zeit wieder..."
-
-#: src/main.cpp:1204
-msgid "State: SWITCH SERVER"
-msgstr ""
-
-#: src/main.cpp:1213
-msgid "State: SWITCH LOGIN"
-msgstr ""
-
-#: src/main.cpp:1221
-msgid "State: SWITCH CHARACTER"
-msgstr ""
-
-#: src/main.cpp:1230
-msgid "State: LOGOUT ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1235
-msgid "State: WAIT"
-msgstr ""
-
-#: src/main.cpp:1239
-msgid "State: EXIT"
-msgstr ""
-
-#: src/main.cpp:1244
-msgid "State: FORCE QUIT"
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
+"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/main.cpp:1251
-msgid "State: ERROR"
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
+"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/main.cpp:1275
-msgid "Quitting"
-msgstr "Beenden"
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
 
 #: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
@@ -4532,380 +2599,335 @@ msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
 msgid "Kick succeeded!"
 msgstr "Spieler aus dem Kanal geworfen!"
 
-#: src/net/ea/adminhandler.cpp:98
-msgid "@kick "
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:108
-msgid "@ban "
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:118
-msgid "@unban "
-msgstr ""
-
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr "Du hast nichts zu verkaufen."
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr "Vielen Dank für den Einkauf."
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr "Kauf fehlgeschlagen."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr "Vielen Dank für den Verkauf."
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr "Verkauf fehlgeschlagen."
 
-#: src/net/ea/charserverhandler.cpp:75
-#, c-format
-msgid "CharServerHandler: Packet ID: %x, Length: %d"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:91
-#, c-format
-msgid "CharServer: Player: %s (%d)"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:101
+#: src/net/ea/charserverhandler.cpp:103
 msgid "Access denied."
 msgstr "Zugang verweigert"
 
-#: src/net/ea/charserverhandler.cpp:104
+#: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht benutzen"
 
-#: src/net/ea/charserverhandler.cpp:107
+#: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown failure to select character."
 msgstr "Unbekannter Fehler bei Auswahl des Charakters"
 
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
 "vergeben."
 
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
+msgid "Info"
+msgstr "Info"
+
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr "Spieler gelöscht."
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr "Spieler konnte nicht gelöscht werden."
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:309
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Stärke:"
 
-#: src/net/ea/charserverhandler.cpp:242 src/net/manaserv/charhandler.cpp:310
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agilität:"
 
-#: src/net/ea/charserverhandler.cpp:243 src/net/manaserv/charhandler.cpp:312
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalität:"
 
-#: src/net/ea/charserverhandler.cpp:244 src/net/manaserv/charhandler.cpp:313
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
-#: src/net/ea/charserverhandler.cpp:245 src/net/manaserv/charhandler.cpp:311
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
-#: src/net/ea/charserverhandler.cpp:246
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr "Glück:"
 
-#: src/net/ea/charserverhandler.cpp:284
-msgid "a@a.com"
-msgstr ""
-
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/net/ea/chathandler.cpp:169
+#: src/net/ea/chathandler.cpp:171
 msgid "MVP player."
 msgstr "Spieler"
 
-#: src/net/ea/chathandler.cpp:186
-#, c-format
-msgid "*%s*"
-msgstr ""
-
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr "Kanäle werden nicht unterstützt!"
 
-#: src/net/ea/gamehandler.cpp:74
-#, c-format
-msgid "Protocol: Player start position: (%d, %d), Direction: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
 msgstr "Benutzer online: %d"
 
-#: src/net/ea/gamehandler.cpp:101
+#: src/net/ea/gamehandler.cpp:100
 msgid "Game"
 msgstr "Spiel"
 
-#: src/net/ea/gamehandler.cpp:101
+#: src/net/ea/gamehandler.cpp:100
 #, fuzzy
 msgid "Request to quit denied!"
 msgstr "Erbitte einen Handel"
 
-#: src/net/ea/generalhandler.cpp:73
-#, fuzzy
-msgid "EnableSync"
-msgstr "Joystick aktivieren"
-
-#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:97
-msgid "str"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "Stärke %+d"
 
-#: src/net/ea/generalhandler.cpp:97 src/net/manaserv/generalhandler.cpp:98
-#, fuzzy
-msgid "agi"
-msgstr "Magie"
-
-#: src/net/ea/generalhandler.cpp:97 src/net/manaserv/generalhandler.cpp:98
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr "Beweglichkeit %+d"
 
-#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:100
-#, fuzzy
-msgid "vit"
-msgstr "Sitzen"
-
-#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "Gesundheit %+d"
 
-#: src/net/ea/generalhandler.cpp:99 src/net/manaserv/generalhandler.cpp:101
-#, fuzzy
-msgid "int"
-msgstr "Sitzen"
-
-#: src/net/ea/generalhandler.cpp:99 src/net/manaserv/generalhandler.cpp:101
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenz %+d"
 
-#: src/net/ea/generalhandler.cpp:100 src/net/manaserv/generalhandler.cpp:99
-msgid "dex"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:100 src/net/manaserv/generalhandler.cpp:99
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Ausdauer %+d"
 
-#: src/net/ea/generalhandler.cpp:101
-msgid "luck"
-msgstr "Glück"
-
-#: src/net/ea/generalhandler.cpp:101
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Glück %+d"
 
-#: src/net/ea/generalhandler.cpp:119
-#, c-format
-msgid "Connection problem: %i"
-msgstr "Verbindungsproblem: %i"
-
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:130
 msgid "Authentication failed."
 msgstr "Authentifizierung verweigert"
 
-#: src/net/ea/generalhandler.cpp:126
+#: src/net/ea/generalhandler.cpp:133
 msgid "No servers available."
 msgstr "Keine Server verfügbar"
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/ea/generalhandler.cpp:137
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen"
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/ea/generalhandler.cpp:140
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet"
 
-#: src/net/ea/generalhandler.cpp:136
+#: src/net/ea/generalhandler.cpp:143
 msgid "Speed hack detected."
 msgstr "Geschwindigkeitsproblem festgestellt"
 
-#: src/net/ea/generalhandler.cpp:139
+#: src/net/ea/generalhandler.cpp:146
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung"
 
-#: src/net/ea/generalhandler.cpp:142
+#: src/net/ea/generalhandler.cpp:149
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler"
 
-#: src/net/ea/generalhandler.cpp:197
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
-#: src/net/ea/generalhandler.cpp:209 src/net/manaserv/generalhandler.cpp:169
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
 msgid "Strength"
 msgstr "Stärke"
 
-#: src/net/ea/generalhandler.cpp:210 src/net/manaserv/generalhandler.cpp:170
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
 msgid "Agility"
 msgstr "Beweglichkeit"
 
-#: src/net/ea/generalhandler.cpp:211 src/net/manaserv/generalhandler.cpp:172
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
 msgid "Vitality"
 msgstr "Gesundheit"
 
-#: src/net/ea/generalhandler.cpp:212 src/net/manaserv/generalhandler.cpp:173
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
 msgid "Intelligence"
 msgstr "Intelligenz"
 
-#: src/net/ea/generalhandler.cpp:213 src/net/manaserv/generalhandler.cpp:171
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
 msgid "Dexterity"
 msgstr "Ausdauer"
 
-#: src/net/ea/generalhandler.cpp:214
+#: src/net/ea/generalhandler.cpp:221
 msgid "Luck"
 msgstr "Glück"
 
-#: src/net/ea/generalhandler.cpp:217
+#: src/net/ea/generalhandler.cpp:224
 msgid "Defense"
 msgstr "Verteidigung:"
 
-#: src/net/ea/generalhandler.cpp:218
+#: src/net/ea/generalhandler.cpp:225
 msgid "M.Attack"
 msgstr "M.Angriff:"
 
-#: src/net/ea/generalhandler.cpp:219
+#: src/net/ea/generalhandler.cpp:226
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
-#: src/net/ea/generalhandler.cpp:220
+#: src/net/ea/generalhandler.cpp:227
 #, c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/ea/generalhandler.cpp:228
 #, c-format
 msgid "% Evade"
 msgstr "% Evade"
 
-#: src/net/ea/generalhandler.cpp:222
+#: src/net/ea/generalhandler.cpp:229
 #, c-format
 msgid "% Critical"
 msgstr "% Critical"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Diese Hilfe anzeigen"
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
-msgstr "/create > Erstelle eine neue Party"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
-msgstr "/new > Ersatz für create"
+#: src/net/ea/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
+
+#: src/net/ea/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Werfe jemanden aus Deiner Party"
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Befehl: /invite <Name>"
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Befehl: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Dieser Befehl lässt Dich die Party verlassen"
+
+#: src/net/ea/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Name der Party fehlt."
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
+
+#: src/net/ea/guildhandler.cpp:303
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s ist nun Mitglied Deiner Party."
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Unbekannte Reaktion auf die Einladung von %s."
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Werfe jemanden aus Deiner Party"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 "/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
 "Party"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
 "Party"
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
-msgstr "Befehl: /new <Party-Name>"
-
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
-msgstr "Befehl: /create <Party-Name>"
-
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
-msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
-
-#: src/net/ea/gui/partytab.cpp:75 src/net/ea/gui/partytab.cpp:117
-msgid "invite"
-msgstr "einladen"
-
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
-msgstr "Befehl: /invite <Name>"
-
-#: src/net/ea/gui/partytab.cpp:82 src/net/ea/gui/partytab.cpp:121
-msgid "leave"
-msgstr "verlassen"
-
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
-msgstr "Befehl: /leave"
-
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
-#: src/net/ea/gui/partytab.cpp:87 src/net/ea/gui/partytab.cpp:129
-#: src/net/ea/gui/partytab.cpp:161 src/resources/itemdb.cpp:128
-msgid "item"
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Befehl: /item <Wert>"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
 "Party."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4913,30 +2935,25 @@ msgstr ""
 "<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
 "Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Befehl: /item"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
 "nicht."
 
-#: src/net/ea/gui/partytab.cpp:97 src/net/ea/gui/partytab.cpp:164
-#: src/net/ea/gui/partytab.cpp:196
-msgid "exp"
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Befehl: /exp <Wert>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4944,136 +2961,105 @@ msgstr ""
 "Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
 "erlauben, \"0\",\"no\",\"false\" verbieten es."
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Befehl: /exp"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
 "aktiviert ist."
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr "Name der Party fehlt."
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:193
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr "Teilen von Gegenständen aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:199
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr "Teilen von Gegenständen deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:205
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr "Teilen von Gegenständen nicht möglich."
 
-#: src/net/ea/gui/partytab.cpp:145
+#: src/net/ea/gui/partytab.cpp:141
 #, fuzzy
 msgid "Item sharing unknown."
 msgstr "Teilen von Gegenständen aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:170
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:176
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr "Teilen der Erfahrungspunkte deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:177 src/net/ea/partyhandler.cpp:182
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr "Teilen der Erfahrungspunkte nicht möglich."
 
-#: src/net/ea/gui/partytab.cpp:180
+#: src/net/ea/gui/partytab.cpp:176
 #, fuzzy
 msgid "Experience sharing unknown."
 msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/ea/inventoryhandler.cpp:152 src/net/ea/inventoryhandler.cpp:193
-#, c-format
-msgid ""
-"Index: %d, ID: %d, Type: %d, Identified: %d, Qty: %d, Cards: %d, %d, %d, %d"
-msgstr ""
-
-#: src/net/ea/inventoryhandler.cpp:262
+#: src/net/ea/inventoryhandler.cpp:281
 msgid "Failed to use item."
 msgstr "Gegenstand konnte nicht benutzt werden."
 
-#: src/net/ea/inventoryhandler.cpp:358
+#: src/net/ea/inventoryhandler.cpp:391
 msgid "Unable to equip."
 msgstr "Kann Gegenstand nicht Ausrüsten."
 
-#: src/net/ea/inventoryhandler.cpp:372
+#: src/net/ea/inventoryhandler.cpp:402
 msgid "Unable to unequip."
 msgstr "Kann Gegenstand nicht ablegen."
 
-#: src/net/ea/inventoryhandler.cpp:392
-#, c-format
-msgid "Arrows equipped: %i"
-msgstr "Pfeile ausgerüstet: %i"
-
-#: src/net/ea/loginhandler.cpp:78
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
 
-#: src/net/ea/loginhandler.cpp:81 src/net/manaserv/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
 msgid "Old password incorrect."
 msgstr "Altes Passwort fehlerhaft"
 
-#: src/net/ea/loginhandler.cpp:84
+#: src/net/ea/loginhandler.cpp:85
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz"
 
-#: src/net/ea/loginhandler.cpp:87 src/net/ea/loginhandler.cpp:173
-#: src/net/manaserv/charhandler.cpp:124 src/net/manaserv/charhandler.cpp:226
-#: src/net/manaserv/loginhandler.cpp:92 src/net/manaserv/loginhandler.cpp:122
-#: src/net/manaserv/loginhandler.cpp:155 src/net/manaserv/loginhandler.cpp:270
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 msgid "Unknown error."
 msgstr "Unbekannter Fehler"
 
-#: src/net/ea/loginhandler.cpp:102
-#, c-format
-msgid "Received update host \"%s\" from login server."
-msgstr "Empfange Updateserver \"%s\" vom Loginserver"
-
-#: src/net/ea/loginhandler.cpp:131
-#, c-format
-msgid "Network: Server: %s (%s:%d)"
-msgstr "Netzwerk: Server: %s (%s:%d)"
-
-#: src/net/ea/loginhandler.cpp:143
-#, c-format
-msgid "Login::error code: %i"
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:147
+#: src/net/ea/loginhandler.cpp:149
 msgid "Unregistered ID."
 msgstr "Unbekannte ID"
 
-#: src/net/ea/loginhandler.cpp:150
+#: src/net/ea/loginhandler.cpp:152
 msgid "Wrong password."
 msgstr "Falsches Passwort"
 
-#: src/net/ea/loginhandler.cpp:153
+#: src/net/ea/loginhandler.cpp:155
 msgid "Account expired."
 msgstr "Account abgelaufen"
 
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:158
 msgid "Rejected from server."
 msgstr "Vom Server zurückgewiesen"
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM "
 "Team."
 
-#: src/net/ea/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:165
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -5082,185 +3068,95 @@ msgstr ""
 "Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
 "Bitte wende dich mittels des Forums an das GM Team."
 
-#: src/net/ea/loginhandler.cpp:170
+#: src/net/ea/loginhandler.cpp:172
 msgid "This user name is already taken."
 msgstr "Dieser Spielername ist bereits vergeben"
 
-#: src/net/ea/loginhandler.cpp:257
-msgid "_F"
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:257
-msgid "_M"
-msgstr ""
-
-#: src/net/ea/network.cpp:138
-msgid "Tried to connect an already connected socket!"
-msgstr ""
-
 #: src/net/ea/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:149
-#, c-format
-msgid "Network::Connecting to %s:%i"
-msgstr ""
-
-#: src/net/ea/network.cpp:164
-msgid "Unable to create network worker thread"
-msgstr ""
-
-#: src/net/ea/network.cpp:232
-#, c-format
-msgid "Unhandled packet: %x"
-msgstr "Nicht behandeltes Paket : %x"
-
-#: src/net/ea/network.cpp:251
-msgid "Error in SDLNet_TCP_Send(): "
-msgstr ""
-
-#: src/net/ea/network.cpp:326
-#, c-format
-msgid "Received packet 0x%x of length %d\n"
-msgstr ""
-
-#: src/net/ea/network.cpp:342
+#: src/net/ea/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr "Nicht möglich den host \" aufzulösen"
 
-#: src/net/ea/network.cpp:345
-#, c-format
-msgid "SDLNet_ResolveHost: %s"
-msgstr ""
-
-#: src/net/ea/network.cpp:354
-#, c-format
-msgid "Error in SDLNet_TCP_Open(): %s"
-msgstr ""
-
-#: src/net/ea/network.cpp:359
-#, c-format
-msgid "Network::Started session with %s:%i"
-msgstr ""
-
-#: src/net/ea/network.cpp:373
-msgid "Error in SDLNet_AllocSocketSet(): "
-msgstr ""
-
-#: src/net/ea/network.cpp:380
-msgid "Error in SDLNet_AddSocket(): "
-msgstr ""
-
-#: src/net/ea/network.cpp:393
-msgid "Error: SDLNet_CheckSockets"
-msgstr ""
-
-#: src/net/ea/network.cpp:407
-msgid "Disconnected."
-msgstr ""
-
-#: src/net/ea/network.cpp:411
+#: src/net/ea/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen. "
 
-#: src/net/ea/network.cpp:438
-msgid "Error in SDLNet_TCP_Recv(), "
-msgstr ""
-
-#: src/net/ea/network.cpp:439
-msgid " sockets are ready: "
-msgstr ""
-
-#: src/net/ea/network.cpp:447
-#, c-format
-msgid "Error in SDLNet_DelSocket(): %s"
-msgstr ""
-
-#: src/net/ea/network.cpp:460
-#, c-format
-msgid "Network error: %s"
-msgstr "Netzwerkfehler: %s"
-
-#: src/net/ea/partyhandler.cpp:78
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Konnte Party nicht erstellen."
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Party erfolgreich erstellt."
 
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ist bereits Mitglied einer Party."
 
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s ist nun Mitglied Deiner Party."
 
-#: src/net/ea/partyhandler.cpp:128
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
-#: src/net/ea/partyhandler.cpp:185
-#, c-format
-msgid "Unknown party exp option: %d\n"
-msgstr "Unbekannte Party exp Option: %d\n"
-
-#: src/net/ea/partyhandler.cpp:208
-#, c-format
-msgid "Unknown party item option: %d\n"
-msgstr "Unbekannte Party Item Option: %d\n"
-
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr "Du hast die Party verlassen."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr "%s hat Deine Party verlassen."
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 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:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:268
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "Ach ja: Du bist Tot."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:269
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:271
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "Du bist nicht länger lebendig."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:272
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:273
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "Game Over!"
 
@@ -5268,7 +3164,7 @@ msgstr "Game Over!"
 msgid "Insert coin to continue."
 msgstr "Gib eine Münze ein um weiter zuspielen."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:274
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -5276,7 +3172,7 @@ msgstr ""
 "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
 "besserem Ort gegangen."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:276
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -5284,27 +3180,27 @@ msgstr ""
 "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
 "nicht ganz so genial, wie Du dachtest..."
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:278
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "Ich glaube, das war nicht so gut."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:279
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:280
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:281
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "Vernichtet."
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:282
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:283
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -5369,50 +3265,30 @@ msgstr "Du warst einmal ein Spieler."
 msgid "You're pining for the fjords."
 msgstr "Du schmachtest nach den Fjorden."
 
-#: src/net/ea/playerhandler.cpp:184
-#, c-format
-msgid "Warping to %s (%d, %d)"
-msgstr "Flüsternd zu %s: (%d ,%d)"
-
-#: src/net/ea/playerhandler.cpp:214
-#, c-format
-msgid "Adjust scrolling by %d:%d"
-msgstr "Justiere Scrolling %d:%d"
-
-#: src/net/ea/playerhandler.cpp:242 src/net/ea/playerhandler.cpp:303
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/net/ea/playerhandler.cpp:243
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
 
-#: src/net/ea/playerhandler.cpp:324
+#: src/net/ea/playerhandler.cpp:333
 #, c-format
 msgid "You picked up %s."
 msgstr "Du hast %s aufgehoben "
 
-#: src/net/ea/playerhandler.cpp:360
+#: src/net/ea/playerhandler.cpp:369
 msgid "Cannot raise skill!"
 msgstr "Kann Skill nicht erhöhen!"
 
-#: src/net/ea/playerhandler.cpp:521
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr "Rüste dich zuerst mit Pfeilen aus."
 
-#: src/net/ea/playerhandler.cpp:525
-#, c-format
-msgid "0x013b: Unhandled message %i"
-msgstr ""
-
-#: src/net/ea/specialhandler.cpp:138
-#, c-format
-msgid "Action: %d/%d"
-msgstr ""
-
 #: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Handel fehlgeschlagen!"
@@ -5493,153 +3369,136 @@ msgstr "Konnte nichts stehlen..."
 msgid "Poison had no effect..."
 msgstr "Das Gift hatte keine Wirkung..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:118
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s möchte mit dir handeln, stimmst du zu?"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 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:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handel nicht möglich. Spieler existiert nicht."
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel aus unbekanntem Grund abgebrochen"
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handel: Du und %s"
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Handel mit %s abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr "Übergangenes Handelsabbruchspaket."
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 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:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:150
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "Handel abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:157
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "Handel abgeschlossen."
 
-#: src/net/manaserv/beinghandler.cpp:288
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "Press OK to respawn."
 msgstr "Drücke \"OK\" um neu anzufangen."
 
-#: src/net/manaserv/beinghandler.cpp:289
+#: src/net/manaserv/beinghandler.cpp:325
 msgid "You Died"
 msgstr "Du bist tot."
 
-#: src/net/manaserv/charhandler.cpp:108
-msgid "Player deleted."
-msgstr "Spieler gelöscht"
-
-#: src/net/manaserv/charhandler.cpp:118 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
 msgid "Not logged in."
 msgstr "nicht angemeldet"
 
-#: src/net/manaserv/charhandler.cpp:121
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
-
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:131
 msgid "No empty slot."
 msgstr "Kein freier Slot."
 
-#: src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:134
 msgid "Invalid name."
 msgstr "Ungültiger Name."
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:137
 msgid "Character's name already exists."
 msgstr "Benutzername bereits vorhanden"
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:140
 msgid "Invalid hairstyle."
 msgstr "Ungültiger Haarstil."
 
-#: src/net/manaserv/charhandler.cpp:211
+#: src/net/manaserv/charhandler.cpp:143
 msgid "Invalid hair color."
 msgstr "Ungültige Haarfarbe."
 
-#: src/net/manaserv/charhandler.cpp:214
+#: src/net/manaserv/charhandler.cpp:146
 msgid "Invalid gender."
 msgstr "Ungültiges Geschlecht."
 
-#: src/net/manaserv/charhandler.cpp:217
+#: src/net/manaserv/charhandler.cpp:149
 msgid "Character's stats are too high."
 msgstr "Spielfigurattribute sind zu groß."
 
-#: src/net/manaserv/charhandler.cpp:220
+#: src/net/manaserv/charhandler.cpp:152
 msgid "Character's stats are too low."
 msgstr "Spielfigurattribute sind zu klein"
 
-#: src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:155
 msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:260
-#, c-format
-msgid "Game server: %s:%d"
-msgstr ""
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
+msgstr "Spieler gelöscht"
 
-#: src/net/manaserv/charhandler.cpp:262
-#, c-format
-msgid "Chat server: %s:%d"
-msgstr ""
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Unbekannter Fehler"
 
-#: src/net/manaserv/charhandler.cpp:291
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "Kein Server verfügbar"
 
-#: src/net/manaserv/charhandler.cpp:314
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Willenskraft:"
 
-#: src/net/manaserv/chathandler.cpp:132
-msgid "Chatserver: Not logged in"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:135
-msgid "Chatserver: Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: src/net/manaserv/chathandler.cpp:165
-msgid "Unknown : "
-msgstr "Unbekannt: "
-
 #: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:265
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr "Thema: %s"
@@ -5648,10 +3507,6 @@ msgstr "Thema: %s"
 msgid "Players in this channel:"
 msgstr "Spieler im Kanal:"
 
-#: src/net/manaserv/chathandler.cpp:193 src/net/manaserv/chathandler.cpp:273
-msgid "@"
-msgstr ""
-
 #: src/net/manaserv/chathandler.cpp:201
 msgid "Error joining channel."
 msgstr "Fehler beim Betreten des Kanals."
@@ -5660,10 +3515,6 @@ msgstr "Fehler beim Betreten des Kanals."
 msgid "Listing channels."
 msgstr "Liste Kanäle"
 
-#: src/net/manaserv/chathandler.cpp:215
-msgid " - "
-msgstr ""
-
 #: src/net/manaserv/chathandler.cpp:219
 msgid "End of channel list."
 msgstr ""
@@ -5693,642 +3544,1223 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr "Unbekannter Befehl."
 
-#: src/net/manaserv/generalhandler.cpp:102
-#, fuzzy
-msgid "will"
-msgstr "Fertigkeiten"
-
-#: src/net/manaserv/generalhandler.cpp:102
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "Willensstärke %+d"
 
-#: src/net/manaserv/generalhandler.cpp:174
+#: src/net/manaserv/generalhandler.cpp:171
 msgid "Willpower"
 msgstr "Willenskraft:"
 
-#: src/net/manaserv/guildhandler.cpp:76
-msgid "Received CPMSG_GUILD_CREATE_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:80
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "Gilde erstellt."
 
-#: src/net/manaserv/guildhandler.cpp:85
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr "Fehler beim Erstellen der Gilde."
 
-#: src/net/manaserv/guildhandler.cpp:91
-msgid "Received CPMSG_GUILD_INVITE_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:95
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr "Einladung gesendet."
 
-#: src/net/manaserv/guildhandler.cpp:101
-msgid "Received CPMSG_GUILD_ACCEPT_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:111
-msgid "Received CPMSG_GUILD_GET_MEMBERS_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:145
-msgid "Received CPMSG_GUILD_UPDATE_LIST"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:183
-#, fuzzy
-msgid "Invalid guild event"
-msgstr "Ungültiger Updateserver: "
-
-#: src/net/manaserv/guildhandler.cpp:193
-msgid "Received CPMSG_GUILD_INVITED"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:204
-msgid "Received CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:209
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: src/net/manaserv/guildhandler.cpp:214
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr "Beförderung des Mitglieds gescheitert."
 
-#: src/net/manaserv/guildhandler.cpp:220
-msgid "Received CPMSG_GUILD_REJOIN"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:227
-msgid "Received CPMSG_GUILD_QUIT_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:83
+#: src/net/manaserv/loginhandler.cpp:87
 msgid "Wrong magic_token."
 msgstr "Fehlerhaftes Magiemerkmal"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:260
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 msgid "Already logged in."
 msgstr "Bereits angemeldet"
 
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:263
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 msgid "Server is full."
 msgstr "Server ist voll"
 
-#: src/net/manaserv/loginhandler.cpp:113
+#: src/net/manaserv/loginhandler.cpp:118
 msgid "New password incorrect."
 msgstr "Neues Passwort fehlerhaft"
 
-#: src/net/manaserv/loginhandler.cpp:119 src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
 
-#: src/net/manaserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "New email address incorrect."
 msgstr "Neue E-Mailadresse ist fehlerhaft"
 
-#: src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:152
 msgid "Old email address incorrect."
 msgstr "Alte E-Mailadresse ist fehlerhaft"
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:158
 msgid "The new email address already exists."
 msgstr "Die neue E-Mailadresse ist bereits vorhanden."
 
-#: src/net/manaserv/loginhandler.cpp:176
-msgid "Accountserver: Not logged in"
-msgstr "nicht angemeldet"
-
-#: src/net/manaserv/loginhandler.cpp:179 src/net/manaserv/loginhandler.cpp:203
-msgid "Accountserver: Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: src/net/manaserv/loginhandler.cpp:200
-msgid "Accountserver: Wrong username or password"
-msgstr "Benutzername oder Passwort falsch"
-
-#: src/net/manaserv/loginhandler.cpp:222
-#, c-format
-msgid "%s: %s\n"
-msgstr "%s: %s\n"
-
-#: src/net/manaserv/loginhandler.cpp:231
+#: src/net/manaserv/loginhandler.cpp:239
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:254 src/net/manaserv/loginhandler.cpp:290
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 msgid "Client version is too old."
 msgstr "Die Version des Spiels ist zu alt"
 
-#: src/net/manaserv/loginhandler.cpp:257
+#: src/net/manaserv/loginhandler.cpp:266
 msgid "Wrong username or password."
 msgstr "Benutzername oder Passwort falsch"
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:275
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:293
+#: src/net/manaserv/loginhandler.cpp:303
 msgid "Wrong username, password or email address."
 msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
 
-#: src/net/manaserv/loginhandler.cpp:296
+#: src/net/manaserv/loginhandler.cpp:306
 msgid "Username already exists."
 msgstr "Benutzername bereits vorhanden"
 
-#: src/net/manaserv/loginhandler.cpp:299
+#: src/net/manaserv/loginhandler.cpp:309
 msgid "Email address already exists."
 msgstr "E-Mailadresse bereits vorhanden"
 
-#: src/net/manaserv/loginhandler.cpp:302
+#: src/net/manaserv/loginhandler.cpp:312
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr "Der Party beigetreten."
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr "%s ist der Party beigetreten."
 
-#: src/net/manaserv/partyhandler.cpp:120
+#: src/net/manaserv/partyhandler.cpp:123
 #, c-format
 msgid "%s rejected your invite."
 msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/net/manaserv/playerhandler.cpp:132
-#, c-format
-msgid "Changing server to %s:%d"
-msgstr ""
+#: src/net/manaserv/tradehandler.cpp:96
+msgid "Accepting incoming trade requests."
+msgstr "Akzeptiere eingehende Handelsanfragen."
 
-#: src/net/manaserv/playerhandler.cpp:137
-msgid "ATTRIBUTE UPDATE:"
-msgstr ""
+#: src/net/manaserv/tradehandler.cpp:98
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoriere eingehende Handelsanfragen."
 
-#: src/net/manaserv/playerhandler.cpp:143
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
-msgid "%d set to %d %d"
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:160
-msgid "EXP Update"
-msgstr ""
+msgid "Trading with %s"
+msgstr "Handele mit %s"
 
-#: src/net/manaserv/playerhandler.cpp:183
-msgid "Level Progress Update"
-msgstr "Levelaufstiegsfortschritt"
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/net/manaserv/playerhandler.cpp:200
-#, c-format
-msgid "Warning: Server denied increase of attribute %d (unknown attribute) "
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
 msgstr ""
 
-#: src/net/manaserv/playerhandler.cpp:207
-#, c-format
-msgid "Warning: Server denied increase of attribute %d (no points left) "
+#: src/playerrelations.cpp:334
+msgid "Blink name"
 msgstr ""
 
-#: src/net/manaserv/playerhandler.cpp:215
-#, c-format
-msgid "Warning: Server denied increase of attribute %d (reason unknown) "
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/net/manaserv/playerhandler.cpp:236
-#, c-format
-msgid "Warning: Server denied reduction of attribute %d (unknown attribute) "
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
 msgstr ""
 
-#: src/net/manaserv/playerhandler.cpp:243
+#: src/resources/itemdb.cpp:52
 #, c-format
-msgid "Warning: Server denied reduction of attribute %d (no points left) "
-msgstr ""
+msgid "Attack %+d"
+msgstr "Angriff %+d"
 
-#: src/net/manaserv/playerhandler.cpp:252
+#: src/resources/itemdb.cpp:53
 #, c-format
-msgid "Warning: Server denied reduction of attribute %d (reason unknown) "
-msgstr ""
+msgid "Defense %+d"
+msgstr "Verteidigung %+d"
 
-#: src/net/manaserv/playerhandler.cpp:303
+#: src/resources/itemdb.cpp:54
 #, c-format
-msgid "Changing map to %s (%d, %d)"
-msgstr ""
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/net/manaserv/playerhandler.cpp:326
+#: src/resources/itemdb.cpp:55
 #, c-format
-msgid "Adjust scrolling by %d,%d"
-msgstr ""
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Akzeptiere eingehende Handelsanfragen."
+#: src/resources/itemdb.cpp:114
+msgid "Unknown item"
+msgstr "Unbekannter Gegenstand"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoriere eingehende Handelsanfragen."
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
+msgid "unnamed"
+msgstr "unbenannt"
 
-#: src/net/manaserv/tradehandler.cpp:136
-#, c-format
-msgid "Trading with %s"
-msgstr "Handele mit %s"
+#~ msgid "help"
+#~ msgstr "Hilfe"
+
+#~ msgid "announce"
+#~ msgstr "ankündigen"
+
+#~ msgid "where"
+#~ msgstr "Wo"
+
+#~ msgid "who"
+#~ msgstr "Wer"
 
-#: src/playerrelations.cpp:34
-msgid "nop"
-msgstr "Nö"
+#~ msgid "whisper"
+#~ msgstr "geflüsterte Nachricht"
+
+#~ msgid "ignore"
+#~ msgstr "Ignoriere"
+
+#~ msgid "unignore"
+#~ msgstr "nicht ignorieren"
 
-#: src/playerrelations.cpp:35
 #, fuzzy
-msgid "emote0"
-msgstr "Gefühle"
+#~ msgid "join"
+#~ msgstr "Anmelden"
 
-#: src/playerrelations.cpp:39
-msgid "relation"
-msgstr "Beziehung"
+#, fuzzy
+#~ msgid "list"
+#~ msgstr "Aufteilen"
 
-#: src/playerrelations.cpp:111
-msgid "persistent-player-list"
-msgstr ""
+#, fuzzy
+#~ msgid "clear"
+#~ msgstr "Waffenarm"
 
-#: src/playerrelations.cpp:112
-msgid "player-ignore-strategy"
-msgstr ""
+#~ msgid "party"
+#~ msgstr "Party"
 
-#: src/playerrelations.cpp:113
-msgid "default-player-permissions"
-msgstr ""
+#~ msgid "me"
+#~ msgstr "ich"
 
-#: src/playerrelations.cpp:138 src/playerrelations.cpp:155
-msgid "player"
-msgstr "Spieler"
+#~ msgid "record"
+#~ msgstr "nehme auf"
 
-#: src/playerrelations.cpp:296
-msgid "Completely ignore"
-msgstr "@@ignore|Ignoriere %s komplett@@"
+#, fuzzy
+#~ msgid "toggle"
+#~ msgstr "Logger"
 
-#: src/playerrelations.cpp:310
-msgid "Print '...'"
-msgstr ""
+#~ msgid "present"
+#~ msgstr "Anwesend: "
 
-#: src/playerrelations.cpp:311
-msgid "dotdotdot"
-msgstr ""
+#~ msgid "n"
+#~ msgstr "Nein"
 
-#: src/playerrelations.cpp:316
-msgid "..."
-msgstr ""
+#~ msgid "N"
+#~ msgstr "Nein"
 
-#: src/playerrelations.cpp:326
-msgid "Blink name"
-msgstr ""
+#~ msgid ", coordinates: "
+#~ msgstr ", Koordinaten: "
 
-#: src/playerrelations.cpp:327
 #, fuzzy
-msgid "blinkname"
-msgstr "Unbenannt"
+#~ msgid " "
+#~ msgstr "; "
 
-#: src/playerrelations.cpp:363
-msgid "Floating '...' bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "ItemShortcut"
+#~ msgstr "Kurztaste %d"
 
-#: src/playerrelations.cpp:366
-msgid "Floating bubble"
-msgstr ""
+#, fuzzy
+#~ msgid "EmoteShortcut"
+#~ msgstr "Gefühlstaste %d"
 
-#: src/playerrelations.cpp:367
 #, fuzzy
-msgid "emote1"
-msgstr "Gefühle"
+#~ msgid "logToChat"
+#~ msgstr "Chat"
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Angriff %+d"
+#, fuzzy
+#~ msgid "fpslimit"
+#~ msgstr "Aufteilen"
 
-#: src/resources/itemdb.cpp:53
-msgid "defense"
-msgstr "Verteidigung:"
+#, fuzzy
+#~ msgid "Mana_Screenshot_"
+#~ msgstr "Bildschirmfoto"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Verteidigung %+d"
+#, fuzzy
+#~ msgid "cancel"
+#~ msgstr "Abbrechen"
 
-#: src/resources/itemdb.cpp:54
 #, fuzzy
-msgid "hp"
-msgstr "Geschäft"
+#~ msgid "index"
+#~ msgstr "Im Fenster"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#~ msgid "inc"
+#~ msgstr "Verringern"
 
-#: src/resources/itemdb.cpp:55
-msgid "mp"
-msgstr ""
+#, fuzzy
+#~ msgid "buy"
+#~ msgstr "Kaufen"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+#, fuzzy
+#~ msgid "quit"
+#~ msgstr "Beenden"
 
-#: src/resources/itemdb.cpp:67
-msgid "generic"
-msgstr "Allgemeiner Gegenstand"
+#~ msgid "Description: %s"
+#~ msgstr "Beschreibung: %s"
 
-#: src/resources/itemdb.cpp:68
-msgid "usable"
-msgstr "Benutzbare Gegenstände"
+#~ msgid "Effect: %s"
+#~ msgstr "Effekt: %s"
 
-#: src/resources/itemdb.cpp:69
-msgid "equip-1hand"
-msgstr "Einhänder"
+#, fuzzy
+#~ msgid "BuySell"
+#~ msgstr "Verkaufen"
 
-#: src/resources/itemdb.cpp:70
-msgid "equip-2hand"
-msgstr "Zweihänder"
+#~ msgid "change_password"
+#~ msgstr "Passwort ändern"
 
-#: src/resources/itemdb.cpp:71
-msgid "equip-torso"
-msgstr ""
+#~ msgid "create"
+#~ msgstr "Erstellen"
 
-#: src/resources/itemdb.cpp:72
-msgid "equip-arms"
-msgstr "Armausrüstung"
+#~ msgid "yes"
+#~ msgstr "Ja"
 
-#: src/resources/itemdb.cpp:73
-msgid "equip-head"
-msgstr "Kopfbedeckung"
+#, fuzzy
+#~ msgid "unregister"
+#~ msgstr "Abmelden"
 
-#: src/resources/itemdb.cpp:74
-msgid "equip-legs"
-msgstr "Beinausrüstung"
+#~ msgid "use"
+#~ msgstr "benutze"
 
-#: src/resources/itemdb.cpp:75
-msgid "equip-shield"
-msgstr "Schilde"
+#~ msgid "new"
+#~ msgstr "Neu"
 
-#: src/resources/itemdb.cpp:76
-msgid "equip-ring"
-msgstr "Ring"
+#~ msgid "delete"
+#~ msgstr "Löschen"
 
-#: src/resources/itemdb.cpp:77
-msgid "equip-necklace"
-msgstr "Halsketten"
+#~ msgid "Level %d"
+#~ msgstr "Stufe: %d"
 
-#: src/resources/itemdb.cpp:78
-msgid "equip-feet"
-msgstr "Schuhe & Stiefel"
+#, fuzzy
+#~ msgid "ReturnToggles"
+#~ msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/resources/itemdb.cpp:79
-msgid "equip-ammo"
-msgstr "Waffe"
+#~ msgid "whispertab"
+#~ msgstr "geflüsterte Nachricht"
 
-#: src/resources/itemdb.cpp:85
-msgid "knife"
-msgstr "Messer"
+#, fuzzy
+#~ msgid " : "
+#~ msgstr " host: "
 
-#: src/resources/itemdb.cpp:86
-msgid "sword"
-msgstr "Schwert"
+#~ msgid "no"
+#~ msgstr "Nein"
 
-#: src/resources/itemdb.cpp:87
-msgid "polearm"
-msgstr "Waffenarm"
+#~ msgid "Cancel pressed"
+#~ msgstr "Abbrechen wurde gedrückt"
 
-#: src/resources/itemdb.cpp:88
-msgid "staff"
-msgstr "Stab"
+#~ msgid "Music: "
+#~ msgstr "Lautstärke der Musik: "
 
-#: src/resources/itemdb.cpp:89
-msgid "whip"
-msgstr "Peitsche"
+#~ msgid "music"
+#~ msgstr "Musik"
 
-#: src/resources/itemdb.cpp:90
-msgid "bow"
-msgstr "Bogen"
+#~ msgid "Minimap: "
+#~ msgstr "Übersichtskarte: "
 
-#: src/resources/itemdb.cpp:91
-msgid "shooting"
-msgstr "schießen"
+#~ msgid "minimap"
+#~ msgstr "Übersichtskarte"
 
-#: src/resources/itemdb.cpp:92
-msgid "mace"
-msgstr "Irrgarten"
+#~ msgid "Map: "
+#~ msgstr "Karte: "
 
-#: src/resources/itemdb.cpp:93
-msgid "axe"
-msgstr "Axt"
+#, fuzzy
+#~ msgid "_filename"
+#~ msgstr "Sichtbare Namen"
 
-#: src/resources/itemdb.cpp:94
-msgid "thrown"
-msgstr "geworfen"
+#~ msgid "unequip"
+#~ msgstr "Ausziehen"
 
-#: src/resources/itemdb.cpp:110
-msgid "Initializing item database..."
-msgstr ""
+#~ msgid "Invite User"
+#~ msgstr "Spieler einladen"
 
-#: src/resources/itemdb.cpp:113
-msgid "Unknown item"
-msgstr "Unbekannter Gegenstand"
+#~ msgid "Quit Guild"
+#~ msgstr "Gilde verlassen"
 
-#: src/resources/itemdb.cpp:121
-msgid "items"
-msgstr ""
+#~ msgid "close"
+#~ msgstr "Schließen"
 
-#: src/resources/itemdb.cpp:123
-msgid "ItemDB: Error while loading items.xml!"
-msgstr "Fehler beim Laden von item.xml!"
+#~ msgid "help/"
+#~ msgstr "Hilfe"
 
-#: src/resources/itemdb.cpp:135
-msgid "ItemDB: Invalid or missing item ID in items.xml!"
-msgstr ""
+#~ msgid "drop"
+#~ msgstr "Wegwerfen"
 
-#: src/resources/itemdb.cpp:140
-#, c-format
-msgid "ItemDB: Redefinition of item ID %d"
-msgstr ""
+#~ msgid "split"
+#~ msgstr "Aufteilen"
 
-#: src/resources/itemdb.cpp:143
-msgid "other"
-msgstr "andere"
+#~ msgid "%s/%s"
+#~ msgstr "%s: %s"
 
-#: src/resources/itemdb.cpp:144
-msgid "weight"
-msgstr "Gewicht:"
+#~ msgid "all"
+#~ msgstr "alle"
 
-#: src/resources/itemdb.cpp:145
-msgid "view"
-msgstr "Ansicht"
+#~ msgid "register"
+#~ msgstr "Registrieren"
 
-#: src/resources/itemdb.cpp:148
-msgid "image"
-msgstr "Bild"
+#~ msgid "server"
+#~ msgstr "Server"
 
-#: src/resources/itemdb.cpp:150
-msgid "weapon-type"
-msgstr "Waffentyp"
+#~ msgid "login"
+#~ msgstr "Anmelden"
 
-#: src/resources/itemdb.cpp:151
-msgid "attack-range"
-msgstr "Angriffsreichweite"
+#~ msgid "Minimap"
+#~ msgstr "Übersichtskarte"
 
-#: src/resources/itemdb.cpp:156 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr "unbenannt"
+#~ msgid "Show"
+#~ msgstr "Zeigen"
 
-#: src/resources/itemdb.cpp:180
-msgid "effect"
-msgstr "Effekt:"
+#~ msgid "NpcText"
+#~ msgstr "NpcText"
 
-#: src/resources/itemdb.cpp:188 src/resources/monsterdb.cpp:94
-msgid "sprite"
-msgstr ""
+#~ msgid "reset"
+#~ msgstr "Zurücksetzten"
 
-#: src/resources/itemdb.cpp:191 src/resources/monsterdb.cpp:133
-msgid "particle-effect"
-msgstr "Partikeleffekte"
+#~ msgid "send"
+#~ msgstr "Senden"
 
-#: src/resources/itemdb.cpp:214
-#, c-format
-msgid "ItemDB: Duplicate name of item found item %d"
-msgstr ""
+#~ msgid "previous"
+#~ msgstr "Zurück"
 
-#: src/resources/itemdb.cpp:220
-#, c-format
-msgid "ItemDB: Missing attack range from weapon %i!"
-msgstr ""
+#~ msgid "next"
+#~ msgstr "Weiter"
 
-#: src/resources/itemdb.cpp:224
-msgid "ItemDB: Missing "
-msgstr ""
+#~ msgid "OutfitUnequip0"
+#~ msgstr "Ausziehen"
 
-#: src/resources/itemdb.cpp:224
-#, c-format
-msgid " attribute for item %i!"
-msgstr ""
+#~ msgid "-1"
+#~ msgstr "-1"
 
-#: src/resources/itemdb.cpp:245
-msgid "Unloading item database..."
-msgstr ""
+#~ msgid "OutfitUnequip"
+#~ msgstr "Ausziehen"
 
-#: src/resources/itemdb.cpp:263
-#, c-format
-msgid "ItemDB: Warning, unknown item ID# %d"
-msgstr ""
+#~ msgid "Color"
+#~ msgstr "Farbe"
 
-#: src/resources/itemdb.cpp:280
-#, c-format
-msgid "ItemDB: Warning, unknown item name \"%s\""
-msgstr ""
+#, fuzzy
+#~ msgid "Gradient"
+#~ msgstr "Handeln"
+
+#~ msgid "Delay"
+#~ msgstr "Verzögerung: "
+
+#~ msgid "talk"
+#~ msgstr "Sprechen"
+
+#~ msgid "trade"
+#~ msgstr "Handeln"
+
+#~ msgid "attack"
+#~ msgstr "Angriff"
 
-#: src/resources/itemdb.cpp:291 src/resources/itemdb.cpp:294
-#: src/resources/itemdb.cpp:298
 #, fuzzy
-msgid "unisex"
-msgstr "benutze"
+#~ msgid "disregard"
+#~ msgstr "Unbeachtet"
 
-#: src/resources/itemdb.cpp:294
-msgid "male"
-msgstr "Männlich"
+#~ msgid "friend"
+#~ msgstr "Freund"
 
-#: src/resources/itemdb.cpp:298
-msgid "female"
-msgstr "Weiblich"
+#~ msgid "guild"
+#~ msgstr "Gilde"
+
+#~ msgid "pickup"
+#~ msgstr "Aufheben"
+
+#~ msgid "look"
+#~ msgstr "Schauen "
+
+#~ msgid "chat"
+#~ msgstr "Chat"
+
+#~ msgid "store"
+#~ msgstr "Einlagern"
+
+#~ msgid "retrieve"
+#~ msgstr "Abholen"
+
+#~ msgid "name"
+#~ msgstr "Name"
+
+#~ msgid "PopupMenu: Warning, unknown action '%s'"
+#~ msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
+
+#~ msgid "Recorder"
+#~ msgstr "Aufzeichnung"
+
+#~ msgid "sex"
+#~ msgstr "Geschlecht"
+
+#~ msgid "The queue is empty."
+#~ msgstr "Die Warteschlange ist leer."
+
+#~ msgid "sell"
+#~ msgstr "Verkaufen"
+
+#~ msgid "connect"
+#~ msgstr "Verbinde..."
+
+#~ msgid "Add Entry"
+#~ msgstr "Neuer Eintrag"
+
+#~ msgid "type"
+#~ msgstr "Typ: "
 
-#: src/resources/itemdb.cpp:306 src/resources/monsterdb.cpp:101
 #, fuzzy
-msgid "event"
-msgstr "Letzter Server:"
+#~ msgid "unknown"
+#~ msgstr "Unbekannter Gegenstand"
 
-#: src/resources/itemdb.cpp:309 src/resources/monsterdb.cpp:105
-msgid "hit"
-msgstr "getroffen"
+#~ msgid "connection"
+#~ msgstr "Verbindung"
 
-#: src/resources/itemdb.cpp:313
-msgid "strike"
-msgstr ""
+#~ msgid "manaserv"
+#~ msgstr "manaserver"
 
-#: src/resources/itemdb.cpp:319
-#, c-format
-msgid "ItemDB: Ignoring unknown sound event '%s'"
-msgstr ""
+#, fuzzy
+#~ msgid "eathena"
+#~ msgstr "Erstellen"
 
-#: src/resources/monsterdb.cpp:47
-msgid "Initializing monster database..."
-msgstr ""
+#~ msgid "hostname"
+#~ msgstr "Servername"
 
-#: src/resources/monsterdb.cpp:52
-msgid "monsters"
-msgstr "Monster"
+#~ msgid "port"
+#~ msgstr "Port:"
 
-#: src/resources/monsterdb.cpp:54
-msgid "Monster Database: Error while loading monster.xml!"
-msgstr ""
+#~ msgid "Error retreiving server list: %s\n"
+#~ msgstr "Fehler beim empfangen der Serverliste: %s\n"
 
-#: src/resources/monsterdb.cpp:60
-msgid "monster"
-msgstr "Monster"
+#~ msgid "musicVolume"
+#~ msgstr "Lautstärke der Musik"
 
-#: src/resources/monsterdb.cpp:70
-msgid "targetCursor"
-msgstr ""
+#~ msgid "sfxVolume"
+#~ msgstr "Lautstärke der Klangeffekte"
 
-#: src/resources/monsterdb.cpp:71
-msgid "small"
-msgstr "klein"
+#~ msgid "sound"
+#~ msgstr "Ton"
 
-#: src/resources/monsterdb.cpp:79
-msgid "large"
-msgstr "groß"
+#~ msgid "calibrate"
+#~ msgstr "Kalibrieren"
 
-#: src/resources/monsterdb.cpp:85
-#, c-format
-msgid ""
-"MonsterDB: Unknown target cursor type \"%s\" for %s -using medium sized one"
-msgstr ""
+#~ msgid "joystickEnabled"
+#~ msgstr "Joystick"
 
-#: src/resources/monsterdb.cpp:109
-msgid "miss"
-msgstr "verfehlt"
+#~ msgid "assign"
+#~ msgstr "Zuordnen"
 
-#: src/resources/monsterdb.cpp:113
-msgid "hurt"
-msgstr "verletzten"
+#~ msgid "makeDefault"
+#~ msgstr "stelle Standardeinstellungen her"
 
-#: src/resources/monsterdb.cpp:117
-msgid "die"
-msgstr ""
+#~ msgid "whisper tab"
+#~ msgstr "geflüsterte Nachricht"
 
-#: src/resources/monsterdb.cpp:123
-#, c-format
-msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
-msgstr ""
+#, fuzzy
+#~ msgid "No modes available"
+#~ msgstr "Keine Server verfügbar"
 
-#: src/resources/monsterdb.cpp:135
 #, fuzzy
-msgid "action"
-msgstr "Beziehung"
+#~ msgid "screen"
+#~ msgstr "Vollbild"
 
-#: src/resources/monsterdb.cpp:138
-msgid "particlefx"
-msgstr "als Partikeleffekt"
+#~ msgid "customcursor"
+#~ msgstr "Benutzerdefinierter Zeiger"
 
-#: src/resources/monsterdb.cpp:165
-#, c-format
-msgid "MonsterDB: Warning, unknown monster ID %d requested"
-msgstr ""
+#~ msgid "visiblenames"
+#~ msgstr "Sichtbare Namen"
+
+#~ msgid "particleeffects"
+#~ msgstr "Partikeleffekte"
 
-#~ msgid "Are you sure you want to quit?"
-#~ msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+#~ msgid "showownname"
+#~ msgstr "Zeige eigenen Namen"
+
+#~ msgid "showpickupchat"
+#~ msgstr "Benachrichtigung beim Aufheben"
+
+#, fuzzy
+#~ msgid "showpickupparticle"
+#~ msgstr "als Partikeleffekt"
+
+#, fuzzy
+#~ msgid "fontSize"
+#~ msgstr "Schriftgröße"
+
+#, fuzzy
+#~ msgid "videomode"
+#~ msgstr " Auflösung: "
+
+#, fuzzy
+#~ msgid "pickupchat"
+#~ msgstr "Aufheben"
+
+#, fuzzy
+#~ msgid "pickupparticle"
+#~ msgstr "als Partikeleffekt"
+
+#, fuzzy
+#~ msgid "particledetailslider"
+#~ msgstr "Partikeldetail"
+
+#, fuzzy
+#~ msgid "particledetailfield"
+#~ msgstr "Partikeldetail"
+
+#, fuzzy
+#~ msgid "screenheight"
+#~ msgstr "Bildschirmfoto"
+
+#, fuzzy
+#~ msgid "skills"
+#~ msgstr "Fertigkeiten"
+
+#, fuzzy
+#~ msgid "Error loading skills file: %s"
+#~ msgstr "Fehler beim Laden von %s"
+
+#, fuzzy
+#~ msgid "set"
+#~ msgstr "Zurücksetzten"
+
+#, fuzzy
+#~ msgid "skill"
+#~ msgstr "Fertigkeiten"
+
+#, fuzzy
+#~ msgid "Error loading specials file: %s"
+#~ msgstr "Fehler beim Laden von %s"
+
+#, fuzzy
+#~ msgid " (%+d)"
+#~ msgstr "HP %+d"
+
+#, fuzzy
+#~ msgid "add"
+#~ msgstr "Hinzufügen"
+
+#, fuzzy
+#~ msgid "money"
+#~ msgstr "Gefühle"
+
+#, fuzzy
+#~ msgid "Error loading update file: %s"
+#~ msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
+
+#, fuzzy
+#~ msgid "file"
+#~ msgstr "Grinsen"
+
+#, fuzzy
+#~ msgid "description"
+#~ msgstr "Beschreibung: %s"
+
+#, fuzzy
+#~ msgid "play"
+#~ msgstr "Los!"
+
+#, fuzzy
+#~ msgid "Couldn't load news"
+#~ msgstr "Karte konnte nicht geladen werden"
+
+#~ msgid "Warning this server does not have a %s file falling back to %s"
+#~ msgstr ""
+#~ "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
+
+#~ msgid "%s already here"
+#~ msgstr "%s ist bereits hier"
+
+#, fuzzy
+#~ msgid "users"
+#~ msgstr "benutze"
+
+#, fuzzy
+#~ msgid "topic"
+#~ msgstr "Stopp"
+
+#, fuzzy
+#~ msgid "op"
+#~ msgstr "Geschäft"
+
+#, fuzzy
+#~ msgid "kick"
+#~ msgstr "Aufheben"
+
+#~ msgid "Welcome"
+#~ msgstr "Wilkommen"
+
+#~ msgid ":-)"
+#~ msgstr ":-)"
+
+#~ msgid "Guilds"
+#~ msgstr "Gilden"
+
+#, fuzzy
+#~ msgid "world"
+#~ msgstr "Schwertpolarm"
+
+#, fuzzy
+#~ msgid "keyMoveUp"
+#~ msgstr "Laufe Hoch"
+
+#, fuzzy
+#~ msgid "keyMoveDown"
+#~ msgstr "Laufe Runter"
+
+#, fuzzy
+#~ msgid "keyMoveLeft"
+#~ msgstr "Laufe nach Links"
+
+#, fuzzy
+#~ msgid "keyMoveRight"
+#~ msgstr "Laufe nach Rechts"
+
+#, fuzzy
+#~ msgid "keyAttack"
+#~ msgstr "Angriff"
+
+#, fuzzy
+#~ msgid "keyTargetAttack"
+#~ msgstr "Zielen & Angreifen"
+
+#, fuzzy
+#~ msgid "keySmilie"
+#~ msgstr "Grinsen"
+
+#, fuzzy
+#~ msgid "keyTalk"
+#~ msgstr "Sprechen"
+
+#, fuzzy
+#~ msgid "keyTarget"
+#~ msgstr "NPC anvisieren"
+
+#, fuzzy
+#~ msgid "keyTargetClosest"
+#~ msgstr "Nächstes Ziel anvisieren"
+
+#, fuzzy
+#~ msgid "keyTargetNPC"
+#~ msgstr "NPC anvisieren"
+
+#, fuzzy
+#~ msgid "keyTargetPlayer"
+#~ msgstr "Spieler anvisieren"
+
+#, fuzzy
+#~ msgid "keyPickup"
+#~ msgstr "Aufheben"
+
+#, fuzzy
+#~ msgid "keyHideWindows"
+#~ msgstr "Fenster ausblenden"
+
+#, fuzzy
+#~ msgid "keyBeingSit"
+#~ msgstr "Aktionen"
+
+#, fuzzy
+#~ msgid "keyScreenshot"
+#~ msgstr "Bildschirmfoto"
+
+#, fuzzy
+#~ msgid "keyTrade"
+#~ msgstr "Handeln"
+
+#, fuzzy
+#~ msgid "keyShortcut1"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut2"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut3"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut4"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut5"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut6"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut7"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut8"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut9"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut10"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut11"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyShortcut12"
+#~ msgstr "Tastenkürzel"
+
+#, fuzzy
+#~ msgid "keyWindowInventory"
+#~ msgstr "Inventar"
+
+#, fuzzy
+#~ msgid "keyWindowEquipment"
+#~ msgstr "Ausrüstung"
+
+#, fuzzy
+#~ msgid "keyWindowSkill"
+#~ msgstr "Unbekannte Fähigkeit"
+
+#, fuzzy
+#~ msgid "keyWindowShortcut"
+#~ msgstr "Tastenkürzel"
+
+#~ msgid "Party Window"
+#~ msgstr "Partyfenster"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut1"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut2"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut3"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut4"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut5"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut6"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut7"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut8"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut9"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut10"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut11"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyEmoteShortcut12"
+#~ msgstr "Gefühlstaste %d"
+
+#, fuzzy
+#~ msgid "keyChat"
+#~ msgstr "Chat"
+
+#, fuzzy
+#~ msgid "keyChatScrollDown"
+#~ msgstr "Im Chat runter scrollen"
+
+#, fuzzy
+#~ msgid "keyQuit"
+#~ msgstr "Beenden"
+
+#, fuzzy
+#~ msgid "keyIgnoreInput1"
+#~ msgstr "Ignoriere Eingabe 1"
+
+#, fuzzy
+#~ msgid "keyIgnoreInput2"
+#~ msgstr "Ignoriere Eingabe 2"
+
+#, fuzzy
+#~ msgid "updatehost"
+#~ msgstr "Ungültiger Updateserver: "
+
+#, fuzzy
+#~ msgid "Error: Invalid update host: %s"
+#~ msgstr "Ungültiger Updateserver: "
+
+#, fuzzy
+#~ msgid "Error: %s can't be made, but doesn't exist!"
+#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+
+#, fuzzy
+#~ msgid "Error: %s/%s can't be made, but doesn't exist!"
+#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+
+#, fuzzy
+#~ msgid "appName"
+#~ msgstr "Name"
+
+#, fuzzy
+#~ msgid "Mana"
+#~ msgstr "Mana"
+
+#, fuzzy
+#~ msgid "appShort"
+#~ msgstr "Tastenkürzel"
+
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#, fuzzy
+#~ msgid "defaultServer"
+#~ msgstr "Server auswählen"
+
+#, fuzzy
+#~ msgid "defaultPort"
+#~ msgstr "Standard"
+
+#, fuzzy
+#~ msgid "hwaccel"
+#~ msgstr "Abbrechen"
+
+#, fuzzy
+#~ msgid "Can't create %s. Using defaults."
+#~ msgstr "Chat-Erstellung fehlgeschlagen!"
+
+#, fuzzy
+#~ msgid "The Mana World"
+#~ msgstr "The Mana World %s"
+
+#~ msgid "Can't find Resources directory\n"
+#~ msgstr "Kann das Ressourcen Verzeichnis nicht finden\n"
+
+#~ msgid "Couldn't set %dx%dx%d video mode: %s"
+#~ msgstr "Kann Videomodus %dx%dx%d nicht setzten: %s"
+
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
+
+#~ msgid "default"
+#~ msgstr "Standard"
+
+#~ msgid "password"
+#~ msgstr "Passwort:"
+
+#~ msgid "character"
+#~ msgstr "Spielfigur"
+
+#~ msgid "update-host"
+#~ msgstr "Updateserver: "
+
+#~ msgid "username"
+#~ msgstr "Benutztername"
+
+#~ msgid "screenshot-dir"
+#~ msgstr "Bildschirmfotoordner"
+
+#~ msgid "Username is %s"
+#~ msgstr "Benutzername ist %s"
+
+#~ msgid "Mana %s"
+#~ msgstr "Mana: %s"
+
+#~ msgid "loginMusic"
+#~ msgstr "Loginmusik"
+
+#~ msgid "lastCharacter"
+#~ msgstr "letzter Charakter"
+
+#~ msgid "Memorizing selected character %s"
+#~ msgstr "Speichere den gewählten Charakter %s"
+
+#~ msgid "Quitting"
+#~ msgstr "Beenden"
+
+#, fuzzy
+#~ msgid "EnableSync"
+#~ msgstr "Joystick aktivieren"
+
+#, fuzzy
+#~ msgid "agi"
+#~ msgstr "Magie"
+
+#, fuzzy
+#~ msgid "vit"
+#~ msgstr "Sitzen"
+
+#, fuzzy
+#~ msgid "int"
+#~ msgstr "Sitzen"
+
+#~ msgid "luck"
+#~ msgstr "Glück"
+
+#~ msgid "Connection problem: %i"
+#~ msgstr "Verbindungsproblem: %i"
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Ersatz für create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Befehl: /new <Party-Name>"
+
+#~ msgid "leave"
+#~ msgstr "verlassen"
+
+#~ msgid "Arrows equipped: %i"
+#~ msgstr "Pfeile ausgerüstet: %i"
+
+#~ msgid "Received update host \"%s\" from login server."
+#~ msgstr "Empfange Updateserver \"%s\" vom Loginserver"
+
+#~ msgid "Network: Server: %s (%s:%d)"
+#~ msgstr "Netzwerk: Server: %s (%s:%d)"
+
+#~ msgid "Unhandled packet: %x"
+#~ msgstr "Nicht behandeltes Paket : %x"
+
+#~ msgid "Network error: %s"
+#~ msgstr "Netzwerkfehler: %s"
+
+#~ msgid "Unknown party exp option: %d\n"
+#~ msgstr "Unbekannte Party exp Option: %d\n"
+
+#~ msgid "Unknown party item option: %d\n"
+#~ msgstr "Unbekannte Party Item Option: %d\n"
+
+#~ msgid "Warping to %s (%d, %d)"
+#~ msgstr "Flüsternd zu %s: (%d ,%d)"
+
+#~ msgid "Adjust scrolling by %d:%d"
+#~ msgstr "Justiere Scrolling %d:%d"
+
+#~ msgid "Chatserver: Unknown error"
+#~ msgstr "Unbekannter Fehler"
+
+#~ msgid "Unknown : "
+#~ msgstr "Unbekannt: "
+
+#, fuzzy
+#~ msgid "will"
+#~ msgstr "Fertigkeiten"
+
+#, fuzzy
+#~ msgid "Invalid guild event"
+#~ msgstr "Ungültiger Updateserver: "
+
+#~ msgid "Accountserver: Not logged in"
+#~ msgstr "nicht angemeldet"
+
+#~ msgid "Accountserver: Unknown error"
+#~ msgstr "Unbekannter Fehler"
+
+#~ msgid "Accountserver: Wrong username or password"
+#~ msgstr "Benutzername oder Passwort falsch"
+
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
+
+#~ msgid "Level Progress Update"
+#~ msgstr "Levelaufstiegsfortschritt"
+
+#~ msgid "nop"
+#~ msgstr "Nö"
+
+#, fuzzy
+#~ msgid "emote0"
+#~ msgstr "Gefühle"
+
+#~ msgid "relation"
+#~ msgstr "Beziehung"
+
+#~ msgid "player"
+#~ msgstr "Spieler"
+
+#, fuzzy
+#~ msgid "blinkname"
+#~ msgstr "Unbenannt"
+
+#, fuzzy
+#~ msgid "emote1"
+#~ msgstr "Gefühle"
+
+#~ msgid "defense"
+#~ msgstr "Verteidigung:"
+
+#, fuzzy
+#~ msgid "hp"
+#~ msgstr "Geschäft"
+
+#~ msgid "generic"
+#~ msgstr "Allgemeiner Gegenstand"
+
+#~ msgid "usable"
+#~ msgstr "Benutzbare Gegenstände"
+
+#~ msgid "equip-1hand"
+#~ msgstr "Einhänder"
+
+#~ msgid "equip-2hand"
+#~ msgstr "Zweihänder"
+
+#~ msgid "equip-arms"
+#~ msgstr "Armausrüstung"
+
+#~ msgid "equip-head"
+#~ msgstr "Kopfbedeckung"
+
+#~ msgid "equip-legs"
+#~ msgstr "Beinausrüstung"
+
+#~ msgid "equip-shield"
+#~ msgstr "Schilde"
+
+#~ msgid "equip-ring"
+#~ msgstr "Ring"
+
+#~ msgid "equip-necklace"
+#~ msgstr "Halsketten"
+
+#~ msgid "equip-feet"
+#~ msgstr "Schuhe & Stiefel"
+
+#~ msgid "equip-ammo"
+#~ msgstr "Waffe"
+
+#~ msgid "knife"
+#~ msgstr "Messer"
+
+#~ msgid "sword"
+#~ msgstr "Schwert"
+
+#~ msgid "polearm"
+#~ msgstr "Waffenarm"
+
+#~ msgid "staff"
+#~ msgstr "Stab"
+
+#~ msgid "whip"
+#~ msgstr "Peitsche"
+
+#~ msgid "bow"
+#~ msgstr "Bogen"
+
+#~ msgid "shooting"
+#~ msgstr "schießen"
+
+#~ msgid "mace"
+#~ msgstr "Irrgarten"
+
+#~ msgid "axe"
+#~ msgstr "Axt"
+
+#~ msgid "thrown"
+#~ msgstr "geworfen"
+
+#~ msgid "ItemDB: Error while loading items.xml!"
+#~ msgstr "Fehler beim Laden von item.xml!"
+
+#~ msgid "other"
+#~ msgstr "andere"
+
+#~ msgid "weight"
+#~ msgstr "Gewicht:"
+
+#~ msgid "view"
+#~ msgstr "Ansicht"
+
+#~ msgid "image"
+#~ msgstr "Bild"
+
+#~ msgid "weapon-type"
+#~ msgstr "Waffentyp"
+
+#~ msgid "attack-range"
+#~ msgstr "Angriffsreichweite"
+
+#~ msgid "effect"
+#~ msgstr "Effekt:"
+
+#~ msgid "particle-effect"
+#~ msgstr "Partikeleffekte"
+
+#, fuzzy
+#~ msgid "unisex"
+#~ msgstr "benutze"
+
+#~ msgid "male"
+#~ msgstr "Männlich"
+
+#~ msgid "female"
+#~ msgstr "Weiblich"
+
+#, fuzzy
+#~ msgid "event"
+#~ msgstr "Letzter Server:"
+
+#~ msgid "hit"
+#~ msgstr "getroffen"
+
+#~ msgid "monsters"
+#~ msgstr "Monster"
+
+#~ msgid "monster"
+#~ msgstr "Monster"
+
+#~ msgid "small"
+#~ msgstr "klein"
+
+#~ msgid "large"
+#~ msgstr "groß"
+
+#~ msgid "miss"
+#~ msgstr "verfehlt"
+
+#~ msgid "hurt"
+#~ msgstr "verletzten"
+
+#, fuzzy
+#~ msgid "action"
+#~ msgstr "Beziehung"
+
+#~ msgid "particlefx"
+#~ msgstr "als Partikeleffekt"
 
 #~ msgid "Buddy"
 #~ msgstr "Freund"
@@ -6360,9 +4792,6 @@ msgstr ""
 #~ msgid "Mystery Skill"
 #~ msgstr "Unbekannter Skill"
 
-#~ msgid "Up"
-#~ msgstr "Erhöhen"
-
 #~ msgid "Weapons"
 #~ msgstr "Waffen"
 
@@ -6411,18 +4840,9 @@ msgstr ""
 #~ msgid "Couldn't set "
 #~ msgstr "Konnte Einstellung nicht setzen: "
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Verbinde mit [Charakterserver]..."
-
-#~ msgid "Connecting to account server..."
-#~ msgstr "Verbinde mit [Benutzerdatenserver]..."
-
 #~ msgid "a"
 #~ msgstr "ein"
 
-#~ msgid "Select Character"
-#~ msgstr "Spielfigur auswählen"
-
 #~ msgid "Scroll radius"
 #~ msgstr "Scroll-Radius"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 670ae465..200040ab 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,577 +17,721 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Setup"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Connecting..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Login"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Select Character"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Error"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Password:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Change"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Unregister"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Exit"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:360
+msgid "Network Error"
+msgstr ""
+
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Description: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Effect: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Exit"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Sell"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "The username needs to be at least %d characters long."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "The username needs to be less than %d characters long."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "The password needs to be at least %d characters long."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "The password needs to be less than %d characters long."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Hair Colour:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Hair Style:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Error"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Previous"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Next"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Name: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Level: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Unregister"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "New"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Change"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Unregister"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Money: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,182 +744,223 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Connecting..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Equipment"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Unequip"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Name: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Ambient FX"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Equipment"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Unequip"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventory"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Drop"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Drop"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Effect: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr ""
-
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Change"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "MiniMap"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Next"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Exit"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Next"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Unequip"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -791,329 +976,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Status"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Use"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Skills"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Trade With %s@@"
 
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Attack %+d"
 
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Willpower:"
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Trade With %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Attack %s@@"
-
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: 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:165
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@pickup|Pick Up %s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Equip@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Use@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Drop@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Split@@"
-
-#: src/gui/popupmenu.cpp:372
-#, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@use|Use@@"
-
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Switch server"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Switch character"
 
@@ -1133,137 +1284,181 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Confirm:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "The username needs to be at least %d characters long."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "The username needs to be less than %d characters long."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "The password needs to be at least %d characters long."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "The password needs to be less than %d characters long."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Connecting..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Custom cursor"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Please type both the address and the port of a server."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Setup"
-
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Apply"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Reset Windows"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Sound"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Music volume"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Apply"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Reset Windows"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
@@ -1304,431 +1499,598 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Sell"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "off"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "low"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "high"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Gui opacity"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Ambient FX"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "No"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Switching to full screen"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Changing OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Skills"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Level: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Level: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Are you sure you want to delete this character?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Are you sure you want to delete this character?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Create Character"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Money: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Character stats OK"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Level: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Propose trade"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Add"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "You give:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Change"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Name: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Connecting..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1780,1209 +2142,1436 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Status"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Change"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Equipment"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
+msgid "Social Window"
 msgstr "Reset Windows"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Equipment"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Character stats OK"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Name:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Strength:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agility:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitality:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Attack %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Defense %+d"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Attack %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Defense %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Unregister"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "You give:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Character stats OK"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Character stats OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Character stats OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Character stats OK"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Select amount of items to trade."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Willpower:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Willpower:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3003,20 +3592,48 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Select Character"
+#~ msgid "Description: %s"
+#~ msgstr "Description: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Previous"
+
+#~ msgid "New"
+#~ msgstr "New"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attack %s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancel@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equip@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Use@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Drop@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Split@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@use|Use@@"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Scroll radius"
diff --git a/po/eo.po b/po/eo.po
index 3320ae26..a778c37d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,763 +17,935 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr ""
+
+#: src/client.cpp:623
+msgid "Connecting to server"
+msgstr ""
+
+#: src/client.cpp:650
+msgid "Logging in"
+msgstr ""
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+msgid "Requesting characters"
+msgstr ""
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr ""
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+msgid "Password Change"
+msgstr ""
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+msgid "Email Change"
+msgstr ""
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+msgid "Unregister Successful"
+msgstr ""
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
 msgstr ""
 
-#: 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"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
 msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
+#: src/gui/charselectdialog.cpp:150
+msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
+msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+msgid "Chat"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:119
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "Money: %d"
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/chat.cpp:305
+msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
+#: src/gui/chat.cpp:469
 #, c-format
-msgid "Money: %s"
+msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
-msgid "Chat"
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
 msgstr ""
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
 msgstr ""
 
-#: src/gui/chat.cpp:344
-msgid "Attendance written to record log."
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
 #, c-format
-msgid "Whispering to %s: %s"
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, c-format
+msgid "Map: %s"
 msgstr ""
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr ""
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, c-format
+msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
+#: src/gui/login.cpp:60
+msgid "Change Server"
 msgstr ""
 
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
-
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -789,325 +961,292 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:84
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:92
 #, c-format
-msgid "@@trade|Trade With %s@@"
+msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "@@attack|Attack %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr ""
-
-#: 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@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
@@ -1127,135 +1266,176 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
+#: src/gui/serverdialog.cpp:143
+msgid "Server type:"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
+#: src/gui/serverdialog.cpp:183
+msgid "Connect"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:184
+msgid "Custom Server"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1298,430 +1478,590 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, c-format
+msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/skilldialog.cpp:405
+#, c-format
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/skilldialog.cpp:416
 #, c-format
-msgid "Job: %d"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:147
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:210
+#, c-format
+msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+msgid "Create Party"
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:419
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/trade.cpp:51
-msgid "Propose trade"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+msgid "Money"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+msgid "Level"
+msgstr ""
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
 #: src/gui/trade.cpp:52
-msgid "Confirmed. Waiting..."
+msgid "Propose trade"
 msgstr ""
 
 #: src/gui/trade.cpp:53
-msgid "Agree trade"
+msgid "Confirmed. Waiting..."
 msgstr ""
 
 #: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1773,1206 +2113,1419 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:761
-msgid "Knife"
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/localplayer.cpp:762
-msgid "Sword"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/localplayer.cpp:763
-msgid "Polearm"
+#: src/main.cpp:44
+msgid "Options:"
 msgstr ""
 
-#: src/localplayer.cpp:764
-msgid "Staff"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/localplayer.cpp:765
-msgid "Whip"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/localplayer.cpp:766
-msgid "Bow"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/localplayer.cpp:767
-msgid "Shooting"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/localplayer.cpp:768
-msgid "Mace"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/localplayer.cpp:769
-msgid "Axe"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/localplayer.cpp:770
-msgid "Thrown"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/localplayer.cpp:772
-msgid "Craft"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:263
-msgid "Invalid update host: "
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:576
-msgid "Options:"
+#: src/net/ea/adminhandler.cpp:63
+msgid "Kick failed!"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/net/ea/adminhandler.cpp:65
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
+#: src/net/ea/buysellhandler.cpp:110
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/net/ea/buysellhandler.cpp:117
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/net/ea/buysellhandler.cpp:124
+msgid "Unable to buy."
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/net/ea/buysellhandler.cpp:130
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/net/ea/buysellhandler.cpp:132
+msgid "Unable to sell."
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/net/ea/charserverhandler.cpp:135
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
+msgid "Info"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/net/ea/charserverhandler.cpp:147
+msgid "Character deleted."
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/net/ea/charserverhandler.cpp:152
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+msgid "Strength:"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+msgid "Agility:"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+msgid "Vitality:"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
-msgid "Kick failed!"
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
-msgid "Kick succeeded!"
+#: src/net/ea/charserverhandler.cpp:242
+msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell."
+#: src/net/ea/chathandler.cpp:80
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying."
+#: src/net/ea/chathandler.cpp:84
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy."
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling."
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/gamehandler.cpp:100
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#, c-format
+msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#, c-format
+msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Info"
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#, c-format
+msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Character deleted."
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#, c-format
+msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:140
-msgid "Failed to delete character."
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
-msgid "Strength:"
+#: src/net/ea/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
-msgid "Agility:"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
-msgid "Vitality:"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
-msgid "Intelligence:"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
-msgid "Dexterity:"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:229
-msgid "Luck:"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
-msgid "Whisper could not be sent, user is offline."
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
-msgid "Channels are not supported!"
+#: src/net/ea/generalhandler.cpp:205
+msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength %+d"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
-#, c-format
-msgid "Agility %+d"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
-#, c-format
-msgid "Vitality %+d"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
-#, c-format
-msgid "Intelligence %+d"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:224
+msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:227
 #, c-format
-msgid "Dexterity %+d"
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:228
 #, c-format
-msgid "Luck %+d"
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:199
+msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2993,14 +3546,11 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 4286d484..22269e3c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-05-31 11:16+0000\n"
 "Last-Translator: Jumpy <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,202 +17,319 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Configuración"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "conectando al servidor de mapas...."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "conectarse"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Seleccionar personaje"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "conectando al servidor de mapas...."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Error"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Contraseña:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Modificar"
+
+#: src/client.cpp:863
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "El miembro ha sido promovido con exito."
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Cancelar Cuenta"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "servidor de actualizaciones invalido: "
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "error al crear directorio de actualizaciones"
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Orden desconocida."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "ayuda"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Muestra la ayuda"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Mostrar el mapa"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Mostrar el numero de utilizadores en linea"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diga algo de Usted"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Vacia la ventana"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Enviar un mensaje privado a un utilisador"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias para un Mensaje"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w Alias para un mensaje"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 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:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > Alias para una demanda"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Enseña la lista de los salones publicos"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Entrar o crear un salon"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Crear un nuevo grupo"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > Invita un jugador en un grupo"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Empieza a registrar el chat en un archivo externo"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toogle> determinar si <retorno> alterna el chat"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > conseguir lista de jugadores presentes  (o mandar al chatlog chat "
 "log,"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce >Mensaje global (Solo MJ's)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr "Para màs informacion, haz /help <command>."
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "comando: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 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:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "comando: /help <comando>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "este comando muestra ayuda sobre <otro comando>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "comando : /announce <mensaje>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "solo disponible para GM"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 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:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "comando: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "este comando borra"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Command: /item <policy>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+"este comando muestra el numero de jugadores que actualmente estan conectados"
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Comando: /join <canal>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "este comando sirve para acceder a <canal>"
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Si <channel> no existe, lo crea"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "comando: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "este comando muestra una lista de los canales"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "comando: /me <mensaje>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "este comando le dice a los demas que estas <mensaje>"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "comando: /msg <apodo> <mensaje>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "comando: /whisper <nick> <mensaje>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "comando: /w <apodo> <mensaje>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "este comando le envia un <mensaje> a <apodo>"
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 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:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "comando /query <apodo>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "comando : /q <apodo>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "este comando trata crear una pestaña en el chat para susurros (mensajes "
 "privados)  entre <apodo> y tu"
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Comando: /create <nombre>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "estos comandos crean un grupo <nombre>"
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "comando: /party <nick>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "este comando invita a <apodo> a un grupo contigo"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "comando : /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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."
@@ -220,28 +337,28 @@ msgstr ""
 "este comando crea  una lista de los jugadores a tu alcance y lo envia al "
 "registro de grabaciones o bien al registro de chat"
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "comando: /record <nombre de archivo>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "este comando graba el registro del chat en el archivo <nombre de archivo>"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "comando: /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr "este comando termina la sesion de grabacion"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "comando: /toogle <estado>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -249,7 +366,7 @@ msgstr ""
 "este comando decide si la tecla de retorno deberia alternar el registro de "
 "chat o bien si el registro de chat se oculta de forma automatica"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -257,40 +374,49 @@ msgstr ""
 "<estado> pude ser \"1\" , \"yes\" o\" true\" para activarlo o bien \"0\" , "
 "\"no\" , \"false\" para desactivarlo"
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "comando: /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr "este comando muestra el estatus del boton alternar"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Command: /item <policy>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "comando: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "este comando muestra el nombre del mapa actual"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "comando: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 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:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "teclea /help para una lista de comandos"
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "no se pueden enviar mensajes vacios"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -298,311 +424,348 @@ msgid ""
 msgstr ""
 "No se puede crear una ventana para el nick \"%s\"! o existe ya o eres tu."
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Se te pide reunirte en el channel %s."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "falta el nombre del grupo"
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "la tecla de retorno alterna el chat"
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "el mensaje cierra el chat"
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "ahora la tecla de retorno alterna el chat"
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "el mensaje ahora cierra el chat"
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "El grupo se creo con exito"
+
+#: src/commandhandler.cpp:486
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "las opciones de /%s son yes , no , true , false , 1 , 0"
 
-#: src/engine.cpp:88
-msgid "Could not load map"
-msgstr "No se pudo cargar el mapa"
-
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
-msgstr "Eror cargando %s"
-
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr "general"
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "foto de la pantalla guardada en ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "no se pudo guardar la foto de pantalla"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr "la conexion al servidor se perdio , ahora se cerrara el programa"
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "error de red"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Salir"
-
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "seguro que quieres salir?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr "no"
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "actualmente se estan ignorando las peticiones de comercio recibidas"
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "ahora se estan aceptando las peticiones de comercio"
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "amigo"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "No se pudo cargar el mapa"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr "Eror cargando %s"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "lista de amigos"
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Grupo (%s)"
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "precio: %s / Total: %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
-msgstr "MAX"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Descripción: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Efecto: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Salir"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr "MAX"
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "tienda"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "cambiar direccion de correo electronico"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "cuenta %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
 msgstr "teclee 2 veces la nueva direccion de correo electronico"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "El nombre de usuario debe tener al menos %d caracteres."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "El nombre de usuario puede tener como máximo %d caracteres."
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "la nueva direccion de E-mail ya existe"
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "cambiar contraseña"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "teclear dos veces la contraseña"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "La contraseña debe tener al menos %d caracteres."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "La contraseña puede tener como máximo %d caracteres."
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "teclear dos veces la contraseña"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Color de pelo:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "corte de pelo"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Crear"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Hombre"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Mujer"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuya %d puntos"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Error"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nombre debe tener al menos 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Estatus personaje OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "por favor quita %d puntos"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "confirmar borrado de personaje"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Seguro que quieres borrar este personaje?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "administracion de cuenta y avatar"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Aceptar"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Nombre: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Nivel: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Cancelar Cuenta"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Nuevo"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "cambiar direccion de correo electronico"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Cancelar Cuenta"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Dinero: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "nivel de trabajo %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Cerrar"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "dinero %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "chat"
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "%d jugadores estan presentes"
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "Presente: "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "asistencia grabada en el registro"
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "susurrando a %s: %s"
@@ -615,180 +778,222 @@ msgstr "Sí"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Conectando…"
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Equipo"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "quitarselo"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
-msgstr "clan"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "Tema: %s"
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
-msgstr "crear clan"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nombre: %s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
-msgstr "invitar a jugador"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "ventana del minimapa"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "efectos de particulas"
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
-msgstr "dejar el clan"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "detalle particulas"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Efectos ambientales"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Equipo"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "quitarselo"
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "tirar"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "ranuras"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "peso"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "tirar"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "Aceptar"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "todo"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Seleccione objetos para comerciar."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Seleccione objetos para soltar."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "seleccionar cantidad de objetos a guardar"
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "seleccionar cantidad de objetos a recuperar"
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Seleccione objetos para dividir."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "peso: "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "conectarse"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Puerto:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr "reciente:"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "recordar nombre de usuario"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr "magia:"
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr "usar hechizo de prueba 1"
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr "usar hechizo de prueba 2"
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr "usar hechizo de prueba 3"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "servidor"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "mapa"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "esperando al servidor"
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Siguiente"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr "enviar"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr "resetear"
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Siguiente"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr "Para:"
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "enviar"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "quitarselo"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "texto"
 
@@ -804,325 +1009,302 @@ msgstr "borde del texto"
 msgid "Progress Bar Labels"
 msgstr "etiquetas de la barra de progreso"
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "fondo"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr "destacar"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr "destacar pestaña"
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+#, fuzzy
+msgid "Item Too Expensive"
 msgstr "el objeto es demasiado caro"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+#, fuzzy
+msgid "Item Is Equipped"
 msgstr "el objeto esta equipado"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "MJ"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "susurro"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "ls"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr "grupo"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "clan"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr "servidor"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "gestor d"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "enlance"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr "ser"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "nombres de otros jugadores"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "propio nombre"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "Nombres de los MJs"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "PNJs"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "monstruos"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr "objeto desconocido"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr "genericos"
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr "sombreros"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr "consumibles"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr "faldas"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+#, fuzzy
+msgid "One Handed Weapons"
 msgstr "armas de una mano"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "pantalones"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "zapatos"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
-msgstr "armas de dos manos"
+#: src/gui/palette.cpp:122
+#, fuzzy
+msgid "Two Handed Weapons"
+msgstr "armas de una mano"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr "escudos"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "anillos"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr "collares"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr "brazos"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "municion"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr "efectos de particulas"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr "aviso de recogida"
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr "aviso de exp"
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+#, fuzzy
+msgid "Player Hits Monster"
 msgstr "jugador golpea a monstruo"
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+#, fuzzy
+msgid "Monster Hits Player"
 msgstr "monstruo golpea a jugador"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr "ataque critico"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr "fallos"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr "barra de salud"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr "barra de salud a 3 cuartos"
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr "barra de salud a la mitad"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr "barra de salud a un cuarto"
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr "Grupo (%s)"
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s te invita a unirte a su grupo."
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s te invita a unirte al grupo %s."
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr "Acceptar invitaciones a grupos"
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr "Invitacion acceptada de %s."
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr "Rechazada la invitacion de %s."
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|añadir nombre al chatt@@"
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Intercambiar con %s"
 
-#: 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:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Ataque %+d"
 
-#: 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:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "susurro"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+#: src/gui/popupmenu.cpp:101
+#, fuzzy, c-format
+msgid "Befriend %s"
 msgstr "@@friend|ser amigo de %s@@"
 
-#: src/gui/popupmenu.cpp:99
-#, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|ignorar levemente a %s@@"
+#: src/gui/popupmenu.cpp:106
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "desestimado"
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore|Ignorar del todo a %s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ingnorado"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
-msgstr "@@unignore|dejar de ignorar a  %s@@"
+msgid "Unignore %s"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:118
+#, fuzzy, c-format
+msgid "Completely ignore %s"
 msgstr "@@ignore|ignorar al maximo %s@@"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
 msgstr "@@guild|Invita a %s a unirse a tu clan@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Invita a  %sa unirse a tu grupoy@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|expulsar jugador@@"
+#: src/gui/popupmenu.cpp:144
+#, fuzzy
+msgid "Kick player"
+msgstr "no se le pudo expulsar"
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:153
+#, fuzzy, c-format
+msgid "Talk to %s"
 msgstr "@@talk|Hablar a %s@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+#, fuzzy
+msgid "Kick monster"
 msgstr "@@admin-kick|expulsar monstruor@@"
 
-#: 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:174
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|añadir nombre al chatt@@"
 
-#: src/gui/popupmenu.cpp:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|recoger %s@@"
+#: src/gui/popupmenu.cpp:191
+#, fuzzy, c-format
+msgid "Pick up %s"
+msgstr "recoger"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#, fuzzy
+msgid "Add to chat"
 msgstr "@@chat|Añadir al chatt@@"
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@usar|quitarselo@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Equipar@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Usar@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Tirar@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Dividir@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
-msgstr "@@store|almacenar@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr "almacenar"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|Recuperar@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
+msgstr "recuperar"
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Cambiar servidor"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Cambiar personaje"
 
@@ -1142,137 +1324,189 @@ msgstr "ya esta grabando!!"
 msgid "Starting to record..."
 msgstr "empezando a grabar..."
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr "no se pudo empezar a grabar"
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr "grabando..."
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr "parar de grabar"
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "El nombre de usuario debe tener al menos %d caracteres."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "El nombre de usuario puede tener como máximo %d caracteres."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La contraseña puede tener como máximo %d caracteres."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+#, fuzzy
+msgid "Choose Your Server"
 msgstr "elige tu servidor"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Puerto:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Servidor:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Conectando…"
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Cursor propio"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Escriba la dirección y el puerto de un servidor."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Seleccionar servidor"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Configuración"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Aplicar"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "esperando al servidor"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Reiniciar ventanas"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volumen efectos"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Volumen musica"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "sin texto"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr "asi es  como queda el color"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "colores"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+#, fuzzy
+msgid "Type:"
 msgstr "tipo: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr "estatica"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "pulso"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "arcoiris"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "espectro"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
 msgstr "retraso: "
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+#, fuzzy
+msgid "Red:"
 msgstr "rojo: "
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
 msgstr "verde: "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+#, fuzzy
+msgid "Blue:"
 msgstr "azul: "
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Reiniciar ventanas"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Presione el botón para comenzar la calibración"
@@ -1313,432 +1547,623 @@ msgstr "Predeterminado"
 msgid "Key Conflict(s) Detected."
 msgstr "conflictos entre teclas detectados"
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr "resuelvelo , o el juego puede comportarse de manera extraña"
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Nombre:"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Relacion"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Amigo"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "desestimado"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Ingnorado"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "permitir comercio"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "permitir susurros"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr "poner susurros en pestañas"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "mostrar nombre"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Jugadores"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "cuando ignorando"
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr "muy pequeño"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "pequeño"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "mediano"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr "grande"
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr "sin texto"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "burbujas sin nombres"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr "burbujas con nombres"
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "desactivado"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "bajo"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "Medio"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "nombres visibles"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "efectos de particulas"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+#, fuzzy
+msgid "Show own name"
 msgstr "mostrar nombre"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr "mostrar aviso de recogida"
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr "en chat"
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr "como particula"
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Límite de FPS:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "mostrar nombre"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr "texto sobreoido"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Transparencia menus"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Efectos ambientales"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "detalle particulas"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr "tamaño de letra"
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "no se pudo cambiar a: "
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "en ventana"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "No"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
-msgstr "pantalla completa"
+#: src/gui/setup_video.cpp:381
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "el modo y la restauracion del modo anterior fallaron"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "el modo y la restauracion del modo anterior fallaron"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Cambiar a pantalla completa"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Se necesita reiniciar para aplicar los cambios."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Cambiar a OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "se cambio la resolucion de pantalla"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr "para que el cambio tenga efecto reinicia el programa"
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_video.cpp:522
+#, fuzzy
+msgid "Particle Effect Settings Changed."
 msgstr "efectos de particulas cambiados"
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:523
 msgid "Changes will take effect on map change."
 msgstr "los cambios tienen efecto en cuanto cambies de mapa"
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "habilidad mis"
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Habilidades"
 
-#: 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:149
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "Arriba"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
-msgstr "armas"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "puntos de habilidad: %d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "puntos de habilidad: %d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Habilidades"
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
-msgstr "artesania"
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nivel: %d"
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nivel: %d"
+
+#: src/gui/socialwindow.cpp:117
 #, c-format
-msgid "Job: %d"
-msgstr "trabajo : %d"
+msgid "Invited user %s to guild %s."
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
-msgstr "PV:"
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Guild créada."
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
-msgstr "EXP:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
-msgstr "PM:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
-msgstr "trabajo:"
+#: src/gui/socialwindow.cpp:146
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "crear clan"
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Estadísticas"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "seguro que quieres salir?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Total"
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Invita un jugador en un grupo"
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Coste"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Ataque:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Invita un jugador en un grupo"
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "defensa"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "ataque magico"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "defensa magica"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "seguro que quieres salir?"
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% AcPunteria"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "crear clan"
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% agilidad"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Crear Personaje"
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% reflejos"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Fuerza"
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "invitar a jugador"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "agilidad2"
+#: src/gui/socialwindow.cpp:298
+#, fuzzy
+msgid "Leave"
+msgstr "grande"
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "vitalidad"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Invitacion acceptada de %s."
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "inteligencia"
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Rechazada la invitacion de %s."
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Invitacion acceptada de %s."
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Suerte"
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Rechazada la invitacion de %s."
+
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Eror al crear la guild."
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "puntos de estatus que te quedan: %d"
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
-msgstr "nivel maximo"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "clan"
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
-msgstr "almacenamiento"
+#: src/gui/socialwindow.cpp:485
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "elige tu servidor"
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
-msgstr "almacenar"
+#: src/gui/socialwindow.cpp:497
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
-msgstr "recuperar"
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s te invita a unirte al grupo %s."
+
+#: src/gui/socialwindow.cpp:507
+#, fuzzy
+msgid "Accept Guild Invite"
+msgstr "Acceptar invitaciones a grupos"
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr "Has recibido una invitation para un grupo, pero uno existe ya."
+
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s te invita a unirte a su grupo."
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s te invita a unirte al grupo %s."
+
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s te invita a unirte a su grupo."
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s te invita a unirte al grupo %s."
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr "Acceptar invitaciones a grupos"
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+#, fuzzy
+msgid "Party Name"
+msgstr "grupo"
+
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "elige tu servidor"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Nivel: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "dinero %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr "PV:"
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr "EXP:"
 
-#: src/gui/trade.cpp:51
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr "PM:"
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "trabajo : %d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr "trabajo:"
+
+#: src/gui/statuswindow.cpp:194
+#, fuzzy
+msgid "HP"
+msgstr "PV:"
+
+#: src/gui/statuswindow.cpp:200
+#, fuzzy
+msgid "MP"
+msgstr "PM:"
+
+#: src/gui/statuswindow.cpp:206
+#, fuzzy
+msgid "Exp"
+msgstr "EXP:"
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Dinero: %d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "trabajo:"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Estatus personaje OK"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "puntos de habilidad: %d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Nivel: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr "almacenamiento"
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Proponer"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr "confirmado ... esperando"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr "aceptar trato"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr "aceptado esperando..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "intercambiar: tu"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "Comercio"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
 msgstr "tu recibes %s"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Tu das:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Modificar"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "no se pudo añadir objeto: No puedes sobreponer un tipo de objeto en la "
 "ventana"
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr "No tienes suficiente dinero."
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nombre: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Actualizando ..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Conectando…"
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Jugar"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "error: "
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " anfitrion "
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1 el proceso de actualizacion esta incompleto"
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1 se recomienda que"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo mas tarde"
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Terminado"
 
@@ -1790,637 +2215,746 @@ msgstr "te saca del canal actual"
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "si eres la ultima persona de un canal sera eliminado"
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "comando: /op <nick>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr "hace a <apodo> operador de canal"
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "los operadores de canal pueden expulsar a otros usuarios y/o convertirlos en "
 "op. de canal"
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "comando:/kick <apodo>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr "este comando expulsa a <apodo> del canal"
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "necesitas a un usuario para op"
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr "hace falta un usuario para echarle"
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Anuncio Global"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anuncio global de %s"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
 msgstr "%s susurra: "
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr "no se pude enviar un chat vacio!!"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr "/close > Cierra la pestaña de susurros"
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr "Comando: /close"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr "cierra la pestaña actual"
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Estado"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Comando: /item"
+
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+"este comando muestra el numero de jugadores que actualmente estan conectados"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "clanes"
+#: src/gui/widgets/whispertab.cpp:94
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"este comando graba el registro del chat en el archivo <nombre de archivo>"
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr "amigos"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Estado"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Atajos"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "seleccionar OK"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Modificar"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "elige tu servidor"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr "mover arriba"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr "mover abajo"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr "mover a la izquierda"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr "mover a la derecha"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr "ataque"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr "objetivo y ataque"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr "emoticono"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr "hablar"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr "dejar de atacar"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
 msgstr "objetivo cercano"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr "objetivo PNJ"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr "objetivo jugador"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr "recoger"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr "ocultar ventanas"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr "sentarse"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr "foto de pantalla"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr "admitir /bloquear intercambios"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr "encontrar ruta del raton"
 
-#: 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
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "atajo al objeto %d"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr "ventana de ayuda"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr "ventana de estado"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr "ventana del inventorio"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr "Ventana de equipamiento"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr "ventana de habilidades"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr "ventana del minimapa"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr "ventana del chat"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr "ventana de atajos a objetos"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr "ventana de configuracion"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr "ventana de depuracion"
 
-#: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr "ventana de grupo"
+#: src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Social Window"
+msgstr "ventana de habilidades"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr "ventana de atajos a emoticones"
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "ventana de estado"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "atajo a emoticon %d"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr "cambiar chat"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr "chat arriba"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr "chat abajo"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr "chat anterior"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr "chat siguiente"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr "seleccionar OK"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr "ignorar entrada 1"
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr "ignorar entrada 2"
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr "desarmado"
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr "cuchillo"
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr "espada"
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr "arma de palo"
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr "arma de staff"
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr "latigo"
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr "arco"
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr "disparando"
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr "maza"
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr "hacha"
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr "arrojadizo"
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr "artesanal"
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr "habilidad desconocida"
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr "servidor de actualizaciones invalido: "
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr "error al crear directorio de actualizaciones"
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr " no se puede crear , pero no existe , saliendo..."
-
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "no se pudo configurar: "
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "resuelvelo , o el juego puede comportarse de manera extraña"
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr " modo de video "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
+msgstr "Impossible recoger el objeto."
 
-#: src/main.cpp:575
-msgid "mana"
-msgstr "mana"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Ha recogido un(a) %s [@@%d|%s@@]."
+msgstr[1] "Ha recogido un(a) %s [@@%d|%s@@]."
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr "  -C --config-file : archivo de configuracion a usar"
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr "  -d --data : Directorio para cargar archivos del juego"
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr "  -D --default : elige un servidor y personaje por defecto"
+#: src/main.cpp:45
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : muestra la version"
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
 msgstr "  -h --help : muestra esta ayuda"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
-msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
+#: src/main.cpp:47
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : archivo de configuracion a usar"
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
-msgstr "  -H --update-host : Usar este servidor de actualizaciones"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : conectarse con este nombre se usuario"
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : entrar con esta contraseña"
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : conectarse con este personaje"
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
-msgstr ""
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -U --username : conectarse con este nombre se usuario"
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
-msgstr ""
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -p --port           : Login server port"
+msgstr "  -P --password : entrar con esta contraseña"
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
-msgstr "  -u --skip-update : saltarse bajar las actualizaciones"
+#: src/main.cpp:53
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Usar este servidor de actualizaciones"
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
-msgstr "  -U --username : conectarse con este nombre se usuario"
+#: src/main.cpp:54
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default : elige un servidor y personaje por defecto"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : des habilitar OpenGl para esta sesion"
+#: src/main.cpp:56
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : saltarse bajar las actualizaciones"
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
-msgstr "  -v --version : muestra la version"
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Directorio para cargar archivos del juego"
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "conectando al servidor de mapas...."
+#: src/main.cpp:58
+#, fuzzy
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "conectando al servidor de personajes..."
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : Directorio a usar como directorio raiz"
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "conectando al servidor de cuentas de usuario..."
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : des habilitar OpenGl para esta sesion"
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr "no se le pudo expulsar"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr "se le expulso"
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr "Nada para vender."
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr "Gracias por comprar."
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr "Impossible comprar."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr "Gravias por vender."
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr "Impossibile vender."
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+#, fuzzy
+msgid "Access denied."
 msgstr "acceso denegado"
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
 msgstr "no se pude usar esta ID"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown failure to select character."
 msgstr "fallo desconocido al seleccionar personaje"
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "no se pudo crear personaje. probablemente el nombre este cogido"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr "informacion"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr "Personaje suprimido."
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr "no se pudo borrar personaje"
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Fuerza:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agilidad:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr "suerte:"
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr "El mensaje privado no se pudo enviar, la persona no esta conectada."
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr "El mensaje privado no se pudo enviar, la persona lo ha ignorado."
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Jugador"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr "no se soportan canales!!"
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
-msgstr "no se pudo equipar"
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr "no se pudo desequipar"
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nombre:"
+
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Peticion de intercambio"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "fuerza %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr "agilidad %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "vitalidad %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "inteligencia %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza %+d"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "suerte %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
 msgstr "autenticacion fallida"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
 msgstr "no hay servidores disponibles"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+#, fuzzy
+msgid "Someone else is trying to use this account."
 msgstr "alguien mas esta tratando de usar esta cuenta"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+#, fuzzy
+msgid "This account is already logged in."
 msgstr "esta cuenta ya esta conectada"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+#, fuzzy
+msgid "Speed hack detected."
 msgstr "se detecto hack de velocidad"
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+#, fuzzy
+msgid "Duplicated login."
 msgstr "conexion duplicada"
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
 msgstr "error de conexion desconocido"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "fuiste desconectado del servidor!!"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Fuerza"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "agilidad2"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "vitalidad"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "inteligencia"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Suerte"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "defensa"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "ataque magico"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "defensa magica"
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% AcPunteria"
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% agilidad"
+
+#: src/net/ea/generalhandler.cpp:229
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "ataque critico"
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Mostrar la ayuda"
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
-msgstr "/create > Crear un nuevo grupo"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invitar a un jugador a tu grupo"
+
+#: src/net/ea/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > abandonar tu grupo"
+
+#: src/net/ea/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > expulsar a alguien de tu grupo"
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Command: /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "este comando invita a <apodo> a un grupo contigo"
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Command: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "este comando hace que el jugador deje el grupo"
+
+#: src/net/ea/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "falta el nombre del grupo"
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
-msgstr "new > lo mismo que create"
+#: src/net/ea/guildhandler.cpp:303
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s es ahorra miembro de su grupo."
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "respuesta a invitacion desconocida para %s."
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invitar a un jugador a tu grupo"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > abandonar tu grupo"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > expulsar a alguien de tu grupo"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > mostrar/cambiar opciones de compartir objetos del grupo"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > mostrar/cambiar opciones para compartir experiencia en el grupo"
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
-msgstr "Comando: /new <nombre del grupo>"
-
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
-msgstr "Comando: /create <nombre>"
-
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
-msgstr "estos comandos crean un grupo <nombre>"
-
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
-msgstr "Command: /invite <nick>"
-
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
-msgstr "Command: /leave"
-
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "este comando hace que el jugador deje el grupo"
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Command: /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "cambia el compartir objetos dentro de un grupo"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2428,24 +2962,24 @@ msgstr ""
 "<policy> puede ser  \"1\", \"yes\", \"true\" para compartir, o  \"0\", \"no"
 "\", \"false\" para no compartir"
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este mando permite enseñar la politica de intercambio de objetos en el grupo"
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "este comando cambia si el grupo comparte o no la experiencia"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2453,104 +2987,111 @@ msgstr ""
 "<policy> puede ser \"1\", \"yes\", \"true\" para activar el intercambio de "
 "experiencia o \"0\", \"no\", \"false\" para desactivarla."
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "este comando muestra si el grupo deja compartir experiencia"
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr "falta el nombre del grupo"
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr "se permite compartir objetos"
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr "no se permite compartir objetos"
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr "Imposible compartir ítem."
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "se permite compartir objetos"
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia activado."
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia desactivado."
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr "Imposible compartir experiencia."
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
-msgstr "Impossible recoger el objeto."
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
-msgstr "un(a)"
-
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "Ha recogido un(a) %s [@@%d|%s@@]."
+#: src/net/ea/gui/partytab.cpp:176
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Compartir experiencia activado."
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:281
 msgid "Failed to use item."
 msgstr "No se pudo utilzar el objeto."
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
+msgstr "no se pudo equipar"
+
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr "no se pudo desequipar"
+
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr "La cuenta no se encontro. Por favor conectese de nuevo."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
 msgstr "la contraseña antigua es incorrecta"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+#, fuzzy
+msgid "New password too short."
 msgstr "La nueva contraseña es demasiada corta"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
 msgstr "ID sin registrar."
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+#, fuzzy
+msgid "Account expired."
 msgstr "Cuenta expirada."
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
 msgstr "Rechazado por el servidor."
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
+#, fuzzy
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Has sido bloqueado permanentemente del juego. Por favor, contacta al Equipo "
 "GM."
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2559,86 +3100,105 @@ msgstr ""
 "Usted ha estado prohibido temporalmente el acceso al juego hasta %s.\n"
 "Por favor pongase en contacto con el equipo de GM a traves del forum.."
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está tomado."
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "Impossibile vender."
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "conectando al servidor de mapas...."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "No se ha podido crear el grupo"
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "El grupo se creo con exito"
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ya forma parte del grupo."
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s rechazó tu invitación."
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s es ahorra miembro de su grupo."
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "respuesta a invitacion desconocida para %s."
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr "Acaba de dejar al grupo."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr "%s ha dejado el grupo."
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un miembro desconocido intentó decir: %s"
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr "Por el momento no está soportado invitar de esta forma."
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s no es de su grupo !"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "Estás muerto."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Sentimos informarte de que tu personaje fue muerto en batalla."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "Te quedaste sin vida/"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Las manos heladas de la muerte se llevaron tu alma."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "¡Fin del juego!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr "Inserta una moneda para continuar."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2646,81 +3206,81 @@ msgstr ""
 "No, niños. Tu personaje no murió realmente. Él... eeh... se marchó a un "
 "lugar mejor."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Falló tu plan de romper el arma de tus enemigos golpeándola con tu garganta."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "Creo que esto no funcionó muy bien."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "¿Quieres que tus posesiones sean identificadas?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Lamentablemente, ningún rastro tuyo fue encontrado nunca."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "Parce que te volaron la cabeza."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Ya la has cagado otra vez, pon en tierra ese cuerpo por ahi en los tuneles y "
 "cogete otro."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "No estás muerto aún. Sólo estás descansando."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "Tú ya no existes más."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "Has dejado de existir."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "Has expirado e ido a encontrarte con tu creador."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "eres un tieso"
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "Sin vida, descanza en paz."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Si estuvieras con mas animo no estarias comiendo las raices."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "Tus procesos metabólicos ya son historia."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr "estas al borde de la ramita"
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "Has tocado el fondo."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -2728,288 +3288,455 @@ msgstr ""
 "has terminado de barajar tu vida , has corrido debajo de la cortina y te has "
 "unido al sangriento coro invisible."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "Eres un ex-jugador."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr "estas ganando puntos para acabar en los fiordos"
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Estás cargando más de la mitad de tu peso. No puedes recuperar salud."
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "Has cogido "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr "Poner primero las flechas."
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "comercio fallido"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "emcion fallida"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "sentarse fallido"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "creacion de chat fallida"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "no pudiste unirte al grupo"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "no puedes gritar"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "no has alcanzado un nivel suficientemente alto"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "puntos de vida insuficientes"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "SP insuficientes"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "No tienes ningun memo"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "no puedes hacer eso ahora mismo"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "necesitas otra gmea roja"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "necesitas otra gema azul"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "estas cargando demasiado de esto"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "¿eh? que es eso?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "teletransporte fallido"
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "No pudiste robar nada"
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "el veneno no tuvo efecto"
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr "Peticion de intercambio"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s desea realizar un intercambio con Usted. Accepta ?"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 "Intercambiar es impossible ya que la persona con quien se debe hacer se "
 "encuentra demasiado lejos de ti."
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Intercambio imposible. El personaje no existe/"
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Intercambio anulado por razones desconocidas."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Intercambio: Usted y %s"
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Intercambio con %s anulado."
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "no se pudo añadir el objeto , tu compañero lleva demasiado peso encima"
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "no se pudo añadir el objeto , tu compañero no tiene espacio"
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "no se pudo añadir el objeto , razon desconocida"
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "trato cancelado"
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "trato completado"
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "Press OK to respawn."
 msgstr " pulsa OK para volver a la vida"
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
 msgstr "Has muerto"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "ya estas conectado"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "ese nombre ya existe"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Estatus personaje OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Estatus personaje OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "personaje borrado"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Seleccione objetos para comerciar."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Error desconocido."
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "no hay servidores de juego disponibles"
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Fuerza de voluntad:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr "Tema: %s"
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "jugador golpea a monstruo"
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Comando: /join <canal>"
+
+#: src/net/manaserv/chathandler.cpp:207
+#, fuzzy
+msgid "Listing channels."
+msgstr "Se te pide reunirte en el channel %s."
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s se ha juntado al grupo."
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Orden desconocida."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "fuerza de voluntad: %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Fuerza de voluntad:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "Guild créada."
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr "Eror al crear la guild."
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr "Invitacion enviada."
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr "El miembro ha sido promovido con exito."
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr "Fallo al Promover el miembro"
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
 msgstr "ficha de magia erronea"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "ya estas conectado"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "el servidor esta lleno"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "la nueva contraseña es incorrecta"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "cuenta no conectada , conectate primero"
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "Nueva Direccion de E-mail erronea"
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "Antigua dirreccion de E-mail erronea"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "la nueva direccion de E-mail ya existe"
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "La version de tu cliente es demasiado antigua"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "nombre de usuario o contraseña incorrectos"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "nombre de usuario , contraseña o Email incorrectos"
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "ese nombre ya existe"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "ese E-mail ya existe"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr "Grupo juntado."
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr "%s se ha juntado al grupo."
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s rechazó tu invitación."
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr "Acceptar las peticiones de intercambio."
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorar las peticiones de intercambio."
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr "Intercambiar con %s"
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|ignorar al maximo %s@@"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3030,24 +3757,240 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr "objeto desconocido"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "sin nombre"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "sin nombre"
 
+#~ msgid "no"
+#~ msgstr "no"
+
+#~ msgid "Buddy"
+#~ msgstr "amigo"
+
+#~ msgid "Buddy List"
+#~ msgstr "lista de amigos"
+
+#~ msgid "Description: %s"
+#~ msgstr "Descripción: %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Efecto: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "New"
+#~ msgstr "Nuevo"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "nivel de trabajo %d"
+
+#~ msgid "Present: "
+#~ msgstr "Presente: "
+
+#~ msgid "Quit Guild"
+#~ msgstr "dejar el clan"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "Recent:"
+#~ msgstr "reciente:"
+
+#~ msgid "Magic"
+#~ msgstr "magia:"
+
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "usar hechizo de prueba 1"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "usar hechizo de prueba 2"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "usar hechizo de prueba 3"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "armas de dos manos"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Comerciar con %s@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Atacar a %s@@"
+
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|ignorar levemente a %s@@"
+
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorar del todo a %s@@"
+
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|dejar de ignorar a  %s@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|expulsar jugador@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
+
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|recoger %s@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@usar|quitarselo@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equipar@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Usar@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Tirar@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dividir@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|almacenar@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Recuperar@@"
+
+#~ msgid "Select Server"
+#~ msgstr "Seleccionar servidor"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "no se pudo cambiar a: "
+
+#~ msgid "windowed"
+#~ msgstr "en ventana"
+
+#~ msgid "fullscreen"
+#~ msgstr "pantalla completa"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "habilidad mis"
+
+#~ msgid "Weapons"
+#~ msgstr "armas"
+
+#~ msgid "Crafts"
+#~ msgstr "artesania"
+
+#~ msgid "Stats"
+#~ msgstr "Estadísticas"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Cost"
+#~ msgstr "Coste"
+
+#~ msgid "Attack:"
+#~ msgstr "Ataque:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% reflejos"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "puntos de estatus que te quedan: %d"
+
+#~ msgid "Max level"
+#~ msgstr "nivel maximo"
+
+#~ msgid "curl error "
+#~ msgstr "error: "
+
+#~ msgid " host: "
+#~ msgstr " anfitrion "
+
+#~ msgid "Guilds"
+#~ msgstr "clanes"
+
+#~ msgid "Buddys"
+#~ msgstr "amigos"
+
+#~ msgid "Party Window"
+#~ msgstr "ventana de grupo"
+
+#~ msgid "Unarmed"
+#~ msgstr "desarmado"
+
+#~ msgid "Knife"
+#~ msgstr "cuchillo"
+
+#~ msgid "Sword"
+#~ msgstr "espada"
+
+#~ msgid "Polearm"
+#~ msgstr "arma de palo"
+
+#~ msgid "Staff"
+#~ msgstr "arma de staff"
+
+#~ msgid "Whip"
+#~ msgstr "latigo"
+
+#~ msgid "Bow"
+#~ msgstr "arco"
+
+#~ msgid "Shooting"
+#~ msgstr "disparando"
+
+#~ msgid "Mace"
+#~ msgstr "maza"
+
+#~ msgid "Axe"
+#~ msgstr "hacha"
+
+#~ msgid "Thrown"
+#~ msgstr "arrojadizo"
+
+#~ msgid "Craft"
+#~ msgstr "artesanal"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "habilidad desconocida"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " no se puede crear , pero no existe , saliendo..."
+
+#~ msgid "Couldn't set "
+#~ msgstr "no se pudo configurar: "
+
+#~ msgid " video mode: "
+#~ msgstr " modo de video "
+
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "conectando al servidor de personajes..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "conectando al servidor de cuentas de usuario..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "new > lo mismo que create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Comando: /new <nombre del grupo>"
+
+#~ msgid "a"
+#~ msgstr "un(a)"
+
+#~ msgid "Unnamed"
+#~ msgstr "sin nombre"
+
 #~ msgid "The Mana World %s"
 #~ msgstr "The Mana World %s"
 
-#~ msgid "Select Character"
-#~ msgstr "Seleccionar personaje"
-
 #~ msgid "Scroll radius"
 #~ msgstr "Ratio de scroll"
 
@@ -3069,9 +4012,6 @@ msgstr "sin nombre"
 #~ msgid "Slots: "
 #~ msgstr "ranuras: "
 
-#~ msgid "Player deleted"
-#~ msgstr "personaje borrado"
-
 #~ msgid "items.xml"
 #~ msgstr "items.xml"
 
diff --git a/po/fi.po b/po/fi.po
index 6b1186f0..3130079d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,577 +17,721 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Asetukset"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Yhdistetään..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Kirjaudu sisään"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Valitse hahmo"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Virhe"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Salasana:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Muuta"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Poista palvelimelta"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Sulje"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Kuvaus: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Vaikutus: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Sulje"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Myy"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Peru"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Tili: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Luo"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Virhe"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Tilin ja hahmojen hallinta"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Edellinen"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Seuraava"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Nimi: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Taso: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Poista palvelimelta"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Uusi"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Poista palvelimelta"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Rahatilanne: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,182 +744,224 @@ msgstr "Kyllä"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Yhdistetään..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Varusteet"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Poista varuste käytöstä"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nimi: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Tili: %s"
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Taustaäänet"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Varusteet"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Poista varuste käytöstä"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Tavaraluettelo"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Käytä"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Pudota"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Jaa"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Pudota"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Anna vaihdettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Vaikutus: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Palvelin:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Portti:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr ""
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Muuta"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "Apukartta"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Seuraava"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Sulje"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "Epäpelattava hahmo"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Seuraava"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Poista varuste käytöstä"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -791,329 +977,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Hahmon tiedot"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Käytä"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Taidot"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Hyökkäys %+d"
 
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Tahdonvoima:"
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Hyökkää %s kimppuun@@"
-
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "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:174
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@pickup|Poimi %s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Ota varuste käyttöön@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Käytä@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Pudota maahan@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Pinon jako@@"
-
-#: src/gui/popupmenu.cpp:372
-#, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@use|Käytä@@"
-
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Vaihda palvelinta"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Vaihda hahmoa"
 
@@ -1133,137 +1285,181 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Vahvista:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Sähköpostiosoite:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Portti:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Palvelin:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Yhdistetään..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Tyylitelty hiiren osoitin"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Valitse palvelin"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Asetukset"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Käytä"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Palauta ikkunoiden oletusasetukset"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ääni"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Käytä"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
@@ -1304,431 +1500,599 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Myy"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "pois päältä"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "matala"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "korkea"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Näytä nimet"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Ei"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Kokoruututilaan siirtyminen"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Vaihdetaan OpenGL -toimintatilaan"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Taidot"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Taidot"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Taso: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Taso: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Luo hahmo"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Kiltatoiminta"
+
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:541
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Taso: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Rahatilanne: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Hahmon pistejako OK"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Taso: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Annat:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nimi: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Yhdistetään..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1780,1209 +2144,1438 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Hahmon tiedot"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Kiltatoiminta"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Hahmon tiedot"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Pikavalinnat"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Valitse palvelin"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Muuta"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Varusteet"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
+msgid "Social Window"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Varusteet"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Vahvista hahmon poistopyyntö"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Voima:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Ketteryys:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nimi:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Voima:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Ketteryys:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Elinvoima:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Älykkyys:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Näppäryys:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Hyökkäys %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Puolustus %+d"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Hyökkäys %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Puolustus %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Poista palvelimelta"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "Vaihda salasana"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Annat:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Vahvista hahmon poistopyyntö"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Hahmon pistejako OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Hahmon pistejako OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Vahvista hahmon poistopyyntö"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Anna vaihdettavien tavaroiden määrä."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Tahdonvoima:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Tahdonvoima:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Tahdonvoima:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3003,20 +3596,48 @@ msgstr "Iskupisteet %+d"
 msgid "MP %+d"
 msgstr "Taikapisteet %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Valitse hahmo"
+#~ msgid "Description: %s"
+#~ msgstr "Kuvaus: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Edellinen"
+
+#~ msgid "New"
+#~ msgstr "Uusi"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Hyökkää %s kimppuun@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Peruuta@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Ota varuste käyttöön@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Käytä@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Pudota maahan@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Pinon jako@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@use|Käytä@@"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Kameran perässälaahaus"
diff --git a/po/fr.po b/po/fr.po
index 2461fc41..da91ff03 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@
 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-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-05-29 15:23+0000\n"
 "Last-Translator: Jumpy <Unknown>\n"
 "Language-Team: French\n"
@@ -18,208 +18,324 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Configuration"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Connexion au serveur de cartes..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Connexion"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Sélectionner votre personnnage"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Connexion au serveur de cartes..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Erreur"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Mot de passe :"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Changer"
+
+#: src/client.cpp:863
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "La promotion de ce membre a réussie."
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Se désinscrire"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "Hôte de mise à jour incorrect : "
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "Impossible de créer le dossier de mise à jour !"
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Aide --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Montre l'aide"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Affiche le nom de la carte"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Dire quelque chose à votre propos"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Vide cette fenêtre"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envoie un message privé à un utilisateur"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias de msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Alias de msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 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:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > Alias de query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Affiche une liste de tous les salons publics"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Rejoindre ou créer un salon."
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Créer un nouveau groupe"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 "/record > Commence à enregistrer la conversation dans un fichier externe"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 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:164
+#: src/commandhandler.cpp:182
 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:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Annonce globale (MJ uniquement)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr "Pour plus d'informations, taper /help <command>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Commande : /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Commande : /help <commande>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Cette commande affiche une aide sur la commande <command>."
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Commande : /announce <msg>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** uniquement disponible pour les MJ ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 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:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Commande : /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 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:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Commande : /item <policy>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Commande : /join <channel>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "Cette commande vous fait rentrer dans le salon <channel>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Si <channel> n'existe pas, il sera créé."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "Commande : /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "Cette commande affiche une liste de tous les salons publics."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "Commande : /me <message>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "Commande : /msg <nick> <message>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "Commande : /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "Commande : /w <nick> <message>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "Cette commande envoie le texte <message> au joueur <nick>"
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
 "ck\")."
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "Commande : /query <nick>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "Commande : /q <nick>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 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:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Commande : /create <party-name>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Cette commande crée un nouveau groupe appelé <party-name>"
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "Commande : /party <nick>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Cette commande invite <nick> à rejoindre votre groupe."
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "Commande : /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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."
@@ -228,29 +344,29 @@ msgstr ""
 "dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
 "de la conversation."
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "Commande : /record <filename>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 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:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "Commande : /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr "Cette commande termine une session d'enregistrement."
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "Command: /toggle <state>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -259,7 +375,7 @@ msgstr ""
 "d'enregistrement de la conversation ou si celui-ci se fermera "
 "automatiquement."
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -267,39 +383,48 @@ 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "Commande : /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr "Cette commande vous affiche le status du toggle courant."
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Commande : /item <policy>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Commande : /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 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:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Commande : /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -308,27 +433,63 @@ msgstr ""
 "Il ne peut être créer une fenêtre de conversation avec nick \"%s\" ! Elle "
 "existe déjà ou il s'agit de vous même."
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Il vous est demandé de rejoindre le chan %s."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Indiquez un nom de groupe."
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "Ce message ferme la conversation."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "La touche enter ferme la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "Ce message ferme maintenant la conversation."
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "Création du groupe réussie."
+
+#: src/commandhandler.cpp:486
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
@@ -336,286 +497,287 @@ msgstr ""
 "Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
 "\", \"false\", \"1\", \"0\"."
 
-#: src/engine.cpp:88
-msgid "Could not load map"
-msgstr "La localisation géographique n'a pu être chargé"
-
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
-msgstr "Erreur durant le chargement %s"
-
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "Capture d'écran sauvegardée dans ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "Impossible de sauvegarder la capture d'écran !"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr ""
 "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Quitter"
-
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "Êtes-vous sûr de vouloir sortir ?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr "non"
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "Contact"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "La localisation géographique n'a pu être chargé"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr "Erreur durant le chargement %s"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "Liste de contacts"
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Groupe (%s)"
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Acheter"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prix : %s / Total : %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr "-"
+
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
 msgid "Max"
 msgstr "Max."
 
-#: 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 "Description : %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 "Effet : %s"
-
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Magasin"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Vendre"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Modifier l'adresse mail"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Compte : %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
 msgstr "Entrer de nouveau la nouvelle adresse mail :"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Cette nouvelle adresse email existe déjà."
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "Entrer une nouvelle fois le nouveau mot de passe :"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Le mot de passe doit faire au moins %d caractères."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Le mot de passe doit faire moins de %d caractères."
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "Entrer une nouvelle fois le nouveau mot de passe :"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Création du personnage"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Couleur des cheveux :"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Coupe :"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Créer"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Masculin"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Féminin"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Veuillez distribuer %d points"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Erreur"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Votre nom doit comporter un minimum de 4 caractères."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Gestion du compte et du personnage"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Précédent"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Suivant"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Nom : %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Niveau : %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Se désinscrire"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Nouveau"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Modifier l'adresse mail"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Se désinscrire"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Argent : %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "Niveau de Compétences : %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Fermer"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "Argent : %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "%d joueurs sont présents."
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "Présent : "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "Présence inscrite dans le fichier d'enregistrement."
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
@@ -628,180 +790,222 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Connexion..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Équipement"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Retirer"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
-msgstr "Guilde"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "Sujet : %s"
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
-msgstr "Créer une Guilde"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nom : %s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
-msgstr "Inviter un utilisateur"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Plan"
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
-msgstr "Quitter la guilde"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Effets de particules"
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Détail des particules"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Effets ambiants"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Équipement"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Retirer"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Aide"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventaire"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Équiper"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Jeter"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Partager"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "Cases :"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "Poids :"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Jeter"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "Tout"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Choisissez le nombre d'objets à jeter."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "Sélectionnez le nombre d'objets à stocker."
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "Sélectionnez le nombre d'objet à reprendre"
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Choisissez le nombre d'objets à déplacer."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "Poids : "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Connexion"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Serveur :"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port :"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr "Récent :"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr "Magie"
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr "Jeter le sort d'essai 1"
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr "Jeter le sort d'essai 2"
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr "Jeter le sort d'essai 3"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Serveur"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "Plan"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "Attente du serveur"
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Suivant"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "PNJ"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Suivant"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr "A :"
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr "Echec de l'envoi comme émetteur ou charactère invalide."
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Retirer"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "Texte"
 
@@ -817,326 +1021,302 @@ msgstr "Bordure du texte"
 msgid "Progress Bar Labels"
 msgstr "Texte des barres de progression"
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "Arrière-plan"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr "Surbrillance"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr "Onglet mis en surbrillance"
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+#, fuzzy
+msgid "Item Too Expensive"
 msgstr "Objet trop cher"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+#, fuzzy
+msgid "Item Is Equipped"
 msgstr "L'objet est équipé"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "MJ"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "Message privé"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "Est"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Groupe"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guilde"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr "Serveur"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "Historique"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "Lien"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr "Forme de vie"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "Nom des autres joueurs"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "Mon nom"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "Nom des MJ"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "PNJs"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "Monstres"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr "Type inconnu d'objet"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr "Génériques"
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr "Chapeaux"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr "Utilisables"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr "Chemises"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+#, fuzzy
+msgid "One Handed Weapons"
 msgstr "Armes à une main"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "Pantalon"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "Chaussures"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
-msgstr "Armes à deux mains"
+#: src/gui/palette.cpp:122
+#, fuzzy
+msgid "Two Handed Weapons"
+msgstr "Armes à une main"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr "Boucliers"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "Anneaux"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr "Colliers"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr "Bras"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "Munitions"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr "Effets de particules"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr "Information de récupération"
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr "Information d'expérience"
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+#, fuzzy
+msgid "Player Hits Monster"
 msgstr "Le joueur touche le monstre"
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+#, fuzzy
+msgid "Monster Hits Player"
 msgstr "Le monstre touche le joueur"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr "Coup critique"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr "Ratés"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr "Barre de vie"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr "3/4 Barre de vie"
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr "1/2 Barre de vie"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr "1/4 Barre de vie"
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr "Groupe (%s)"
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s vous a invité à rejoindre son groupe."
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s vous a invité à rejoindre le groupe %s."
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr "Accepter l'invitation pour ce groupe"
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr "Invitation acceptée de la part de %s."
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr "Invitation refusée de la part de %s."
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Ajouter le nom dans la conversation@@"
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Echange avec %s"
 
-#: 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:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Attaque %+d"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Attaquer %s@@"
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Message privé"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+#: src/gui/popupmenu.cpp:101
+#, fuzzy, c-format
+msgid "Befriend %s"
 msgstr "@@friend|Être ami avec %s@@"
 
-#: src/gui/popupmenu.cpp:99
-#, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|Négliger%s@@"
+#: src/gui/popupmenu.cpp:106
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Négligé"
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore|Ignorer %s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignoré"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
-msgstr "@@unignore|Ne plus ignorer %s@@"
+msgid "Unignore %s"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:118
+#, fuzzy, c-format
+msgid "Completely ignore %s"
 msgstr "@@ignore|Complètement ignorer %s@@"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
 msgstr "@@guild|Inviter %s à rejoindre votre guilde@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Invitation de %s à joindre votre groupe@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+#, fuzzy
+msgid "Kick player"
+msgstr "Impossible de sortir la personne !"
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:153
+#, fuzzy, c-format
+msgid "Talk to %s"
 msgstr "@@talk|Parler à %s@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+#, fuzzy
+msgid "Kick monster"
 msgstr "@@admin-kick|Kick monster@@"
 
-#: 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:174
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|Ajouter le nom dans la conversation@@"
 
-#: src/gui/popupmenu.cpp:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Ramasser %s@@"
+#: src/gui/popupmenu.cpp:191
+#, fuzzy, c-format
+msgid "Pick up %s"
+msgstr "Ramasser"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#, fuzzy
+msgid "Add to chat"
 msgstr "@@chat|Ajouter à la conversation@@"
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@use|Déséquiper@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Équiper@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Utiliser@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Jeter@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Partager@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
-msgstr "@@store|Magasin@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr "Entreposer"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|Retirer@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
+msgstr "Récupérer"
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Changer de serveur"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Changer de personnage"
 
@@ -1156,137 +1336,189 @@ msgstr "Enregistrement en cours."
 msgid "Starting to record..."
 msgstr "Début de l'enregistrement..."
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr "Impossible de démarrer l'enregistrement."
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr "En cours d'enregistrement..."
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr "Arrêter l'enregistrement"
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Vérification :"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email :"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Le mot de passe doit faire moins de %d caractères."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+#, fuzzy
+msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Serveur :"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port :"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Serveur :"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Connexion..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Curseur personnalisé"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Sélectionner un serveur"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Configuration"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Appliquer"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Attente du serveur"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Rétablir les fenêtres"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Son"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Pas de texte"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr "Voilà à quoi ressemble cette couleur"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+#, fuzzy
+msgid "Type:"
 msgstr "Type : "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr "Statique"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "Impulsion"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "Spectre"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
 msgstr "Retardé : "
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+#, fuzzy
+msgid "Red:"
 msgstr "Rouge : "
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
 msgstr "Vert : "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+#, fuzzy
+msgid "Blue:"
 msgstr "Bleu : "
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Appliquer"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Rétablir les fenêtres"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
@@ -1327,435 +1559,627 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté"
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
-"Trouver une solution ou des choses étranges se produiront pendant la partie."
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Nom"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutre"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Ami"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "Négligé"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Autoriser les échanges"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "Afficher le nom"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Joueurs"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr "fin"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "Petit"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "Medium"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr "Grand"
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr "Pas de texte"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bulles, sans noms"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr "Bulles avec noms"
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "aucun"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "léger"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "élevé"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "moyen"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "Ouvrir GL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Afficher les noms"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+#, fuzzy
+msgid "Show own name"
 msgstr "Afficher le nom"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr "Afficher les messages de ramassage"
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr "dans la conversation"
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr "avec des particules"
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "Afficher le nom"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr "Texte aérien"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Effets ambiants"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "Détail des particules"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "Impossible de passer à "
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "fenetré"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Non"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
-msgstr "plein écran"
+#: src/gui/setup_video.cpp:381
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "le mode et la restauration du vieux mode ont également échoué !"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "le mode et la restauration du vieux mode ont également échoué !"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Changement OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran changée"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr "Rédémarrez le jeu pour que les changements soient appliqués."
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_video.cpp:522
+#, fuzzy
+msgid "Particle Effect Settings Changed."
 msgstr "Paramètres d'effet de particules changés."
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:523
 msgid "Changes will take effect on map change."
 msgstr "Les changements seront appliqués au changement de carte."
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "Aptitude mystérieuse"
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Compétences"
 
-#: 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:149
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "Augmenter"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
-msgstr "Armes"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Points de compétences : %d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Points de compétences : %d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Compétences"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Niveau : %d"
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
-msgstr "Metiers"
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Niveau : %d"
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:117
 #, c-format
-msgid "Job: %d"
-msgstr "Metier : %d"
+msgid "Invited user %s to guild %s."
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
-msgstr "PV :"
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Guilde créée."
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
-msgstr "Exp :"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
-msgstr "PM :"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
-msgstr "Travail :"
+#: src/gui/socialwindow.cpp:146
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "Créer une Guilde"
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Statut"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Total"
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Coût"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Attaque :"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Invite un utilisateur dans un groupe"
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "Défense :"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "Attaque M. :"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "Défense M. :"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Êtes-vous sûr de vouloir sortir ?"
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Précision :"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "Créer une Guilde"
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% Esquive :"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Création du personnage"
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% Réflexe :"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Force"
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "Inviter un utilisateur"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "Agilité"
+#: src/gui/socialwindow.cpp:298
+#, fuzzy
+msgid "Leave"
+msgstr "Grand"
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "Vitalité"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Invitation acceptée de la part de %s."
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "Intelligence"
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Invitation refusée de la part de %s."
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Dextérité"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Invitation acceptée de la part de %s."
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Chance"
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Invitation refusée de la part de %s."
+
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Erreur lors de la création de la guilde."
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "Point(s) de statut restant(s) : %d"
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
-msgstr "Niveau max."
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Guilde"
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
-msgstr "Stockage"
+#: src/gui/socialwindow.cpp:485
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "Choisissez le serveur"
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
-msgstr "Entreposer"
+#: src/gui/socialwindow.cpp:497
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr ""
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
-msgstr "Récupérer"
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s vous a invité à rejoindre le groupe %s."
+
+#: src/gui/socialwindow.cpp:507
+#, fuzzy
+msgid "Accept Guild Invite"
+msgstr "Accepter l'invitation pour ce groupe"
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
+
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s vous a invité à rejoindre son groupe."
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s vous a invité à rejoindre le groupe %s."
+
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/gui/trade.cpp:51
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s vous a invité à rejoindre le groupe %s."
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr "Accepter l'invitation pour ce groupe"
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+#, fuzzy
+msgid "Party Name"
+msgstr "Groupe"
+
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Choisissez le serveur"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Niveau : %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "Argent : %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr "PV :"
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr "Exp :"
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr "PM :"
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "Metier : %d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr "Travail :"
+
+#: src/gui/statuswindow.cpp:194
+#, fuzzy
+msgid "HP"
+msgstr "PV :"
+
+#: src/gui/statuswindow.cpp:200
+#, fuzzy
+msgid "MP"
+msgstr "PM :"
+
+#: src/gui/statuswindow.cpp:206
+#, fuzzy
+msgid "Exp"
+msgstr "Exp :"
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Argent : %d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "Travail :"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Caractéristiques du personnage Ok"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Points de compétences : %d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Niveau : %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr "Stockage"
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Proposer un troc"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr "Confirmé. En attente..."
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr "Accepter l'échange"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr "Accepté. En attente..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "Échange : Vous"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "Échange"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
 msgstr "Vous recevez %s."
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Vous donnez :"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Changer"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent."
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nom : %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Connexion..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Jouer"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "Courbe d'erreur "
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " hôte : "
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé que"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "##1 vous réessayez plus tard"
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Terminé"
 
@@ -1808,648 +2232,756 @@ msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 "Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "Commande : /op <nick>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "Seul les opérateurs du salon peuvent sortir des utilisateurs et donner les "
 "droit d'opérateur aux autres utilisateurs du salon."
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "Commande : /kick <nick>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr "Cette commande sort <nick> du salon."
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr "Indiquez quel utilisateur sortir !"
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Annonce globale :"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annonce globale de %s :"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
 msgstr "Message privé de %s : "
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr "Impossible d'envoyer une conversation vide !"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr "/close > Ferme l'onglet de conversation privée"
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr "Commande : /close"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr "Cette commande ferme l'onglet courant de conversation privée."
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Statut"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Commande : /item"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Guildes"
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
+
+#: src/gui/widgets/whispertab.cpp:94
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Cette commande active l'enregistrement de la conversation dans le fichier "
+"<filename>."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr "Contacts"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Statut"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Sélectionner OK"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Changer"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Choisissez le serveur"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr "Monter"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr "Descendre"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr "Aller à gauche"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr "Aller à droite"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr "Attaquer"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr "Cibler et Attaquer"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr "Parler"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr "Arrêter d'attaquer"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
 msgstr "Cible la plus proche"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr "Cibler le PNJ"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr "Cibler le Joueur"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr "Ramasser"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr "Cacher les fenêtres"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr "S'assoir"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr "Activer / Désactiver les échanges"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr "Trouver le chemin vers la souris"
 
-#: 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
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Raccourci Objet %d"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr "Fenêtre d'Aide"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr "Fenêtre d'équipements."
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr "Fenêtre du plan"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr "Fenêtre de conversation"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr "Fenêtre de raccourci objet"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
-#: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr "Fenêtre de groupe"
+#: src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Social Window"
+msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d'emote"
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Fenêtre d'état"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'emote %d"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr "Onglet de la conversation précédente"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr "Onglet de la conversation suivante"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr "Désarmé"
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr "Couteau"
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr "Épée"
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr "Pique"
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr "Bâton"
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr "Fouet"
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr "Arc"
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr "Tirer"
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr "Masse"
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr "Hache"
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr "Lancé"
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr "Métier"
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr "Compétence inconnue"
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr "Hôte de mise à jour incorrect : "
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr "Impossible de créer le dossier de mise à jour !"
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
-" ne peut pas être créé, mais il n'existe pourtant pas ! Fermeture du "
-"programme."
-
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "Impossibler d'assigner "
+"Trouver une solution ou des choses étranges se produiront pendant la partie."
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr " mode d'affichage "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
+msgstr "Impossible de ramasser l'objet."
 
-#: src/main.cpp:575
-msgid "mana"
-msgstr "mana"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "vous avez ramassé un(e) %s [@@%d|%s@@]."
+msgstr[1] "vous avez ramassé un(e) %s [@@%d|%s@@]."
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr "Options :"
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr "  -C --config-file : Fichier de configuration a utiliser"
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-"  -d --data : Repertoire dans lequel les données du jeu se trouvent et "
-"seront chargées"
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr ""
-"  -D --default : Choisir le serveur de personnages et le personnage par "
-"défaut"
+#: src/main.cpp:45
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Affiche la version"
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Montre cette aide"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
-msgstr "  -S --home-dir : Répertoire a utiliser comme répertoire principal"
+#: src/main.cpp:47
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Fichier de configuration a utiliser"
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
-msgstr "  -H --update-host : Utilise cette mise à jour d'Hôte"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
-msgstr "  -p --port : Port de connexion au serveur"
-
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 "  Copy text   \t\r\n"
 "-s --server : Nom du serveur pour la connexion ou IP"
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
-msgstr "  -u --skip-update : Passer les téléchargements de mise à jour"
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Port de connexion au serveur"
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
-msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
+#: src/main.cpp:53
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Utilise cette mise à jour d'Hôte"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Désactive OpenGL pour cette session"
+#: src/main.cpp:54
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default : Choisir le serveur de personnages et le personnage par "
+"défaut"
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
-msgstr "  -v --version : Affiche la version"
+#: src/main.cpp:56
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Passer les téléchargements de mise à jour"
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Connexion au serveur de cartes..."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+"  -d --data : Repertoire dans lequel les données du jeu se trouvent et "
+"seront chargées"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "Connexion au serveur de personnages..."
+#: src/main.cpp:58
+#, fuzzy
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : Répertoire a utiliser comme répertoire principal"
+
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : Répertoire a utiliser comme répertoire principal"
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Connexion au serveur de comptes..."
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : Désactive OpenGL pour cette session"
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr "Impossible de sortir la personne !"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr "Sortie de la personne effectuée avec succès !"
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr "Rien à vendre."
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr "Merci pour votre achat."
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr "Impossible d'acheter."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr "Merci pour votre vente."
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr "Impossible de vendre."
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+#, fuzzy
+msgid "Access denied."
 msgstr "Accès refusé"
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
 msgstr "Impossible d'utiliser cet ID"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown failure to select character."
 msgstr "Problème inconnu lors de la séléction du personnage"
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr "Informations"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr "La suppresion du personnage n'a pu s\"effectuer."
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Force :"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agilité :"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalité :"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr "Chance :"
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 "Le message privé n'a pu être envoyé, le destinataire n'est pas connecté."
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Joueur"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr "Les salons ne sont pas gérés !"
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
-msgstr "Impossible d'équiper cet objet."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr "Impossible de deséquiper cet objet."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nom"
+
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Demande d'échange"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "Force %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilité %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalité %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Dextérité %+d"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Chance %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
 msgstr "Échec de l'indentification"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
 msgstr "Aucun serveur n'est disponible"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+#, fuzzy
+msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaye d'utiliser ce compte"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+#, fuzzy
+msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+#, fuzzy
+msgid "Speed hack detected."
 msgstr "Speed hack detecté"
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+#, fuzzy
+msgid "Duplicated login."
 msgstr "Identification dupliquée"
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Force"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "Agilité"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "Vitalité"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Dextérité"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Chance"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Défense :"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Attaque M. :"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Défense M. :"
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Précision :"
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Esquive :"
+
+#: src/net/ea/generalhandler.cpp:229
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Coup critique"
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Affiche cette aide."
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
-msgstr "/create > Créer un nouveau groupe"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invite un joueur à rejoindre votre groupe"
+
+#: src/net/ea/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
-msgstr "/new > Alias de création"
+#: src/net/ea/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Commande : /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Cette commande invite <nick> à rejoindre votre groupe."
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Commande : /leave"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Cette commande vous fait quitter votre groupe actuel."
+
+#: src/net/ea/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Indiquez un nom de groupe."
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s est maintenant membre de votre groupe."
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Réponse d'invitation de %s inconnue."
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invite un joueur à rejoindre votre groupe"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
-msgstr "Commande : /new <party-name>"
-
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
-msgstr "Commande : /create <party-name>"
-
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
-msgstr "Cette commande crée un nouveau groupe appelé <party-name>"
-
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
-msgstr "Commande : /invite <nick>"
-
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
-msgstr "Commande : /leave"
-
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Cette commande vous fait quitter votre groupe actuel."
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Commande : /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Cette commande change les préférences d'échange d'objet du groupe."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2457,26 +2989,26 @@ msgstr ""
 "<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
 "d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Commande : /item"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Cette commande affiche les préférences actuelles du groupe sur le partage "
 "d'objet."
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Commande : /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 "Cette commande change les préférences du groupe sur le partage d'expérience."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2484,106 +3016,113 @@ msgstr ""
 "<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
 "d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Commande : /exp"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Cette commande affiche les préférences actuelles du groupe sur le partage "
 "d'expérience."
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr "Indiquez un nom de groupe."
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr "Partage d'objet desactivé."
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Partage d'objet activé."
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience authorisé."
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non authorisé."
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
-msgstr "Impossible de ramasser l'objet."
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
-msgstr "un(e)"
-
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "vous avez ramassé un(e) %s [@@%d|%s@@]."
+#: src/net/ea/gui/partytab.cpp:176
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Partage d'expérience authorisé."
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:281
 msgid "Failed to use item."
 msgstr "Impossible d'utiliser l'objet."
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
+msgstr "Impossible d'équiper cet objet."
+
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr "Impossible de deséquiper cet objet."
+
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
 msgstr "Ancien mot de passe incorrect"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+#, fuzzy
+msgid "New password too short."
 msgstr "Nouveau mot de passe trop court"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
 msgstr "Erreur inconnue"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
 msgstr "ID non enregistrée"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
 msgstr "Mauvais mot de passe"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+#, fuzzy
+msgid "Account expired."
 msgstr "Compte expiré"
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
 msgstr "Rejeté par le server"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
+#, fuzzy
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
 "contact avec l'équipe des MJ."
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2592,88 +3131,107 @@ msgstr ""
 "Vous avez été banni temporairement du ju depuis %s.\n"
 "Merci de contacter un MJ par le forum."
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé"
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "Impossible de vendre."
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Connexion au serveur de cartes..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Le groupe n'a pu être créé."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Création du groupe réussie."
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s est déjà membre du groupe."
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s a refusé votre invitation."
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s est maintenant membre de votre groupe."
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Réponse d'invitation de %s inconnue."
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr "vous avez quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr "%s a quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un membre inconnu a essayé de dire : %s"
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 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:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "Vous êtes mort."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Nous avons le regret de vous informer que votre personnage est mort sur le "
 "champ de bataille."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "Vous n'êtes plus vraiment en vie."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "Jeu terminé !"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr "veuillez insérer une pièce pour continuer."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2681,7 +3239,7 @@ msgstr ""
 "No, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
 "il... est parti dans un monde meilleur."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2689,76 +3247,76 @@ msgstr ""
 "Votre plan de casser l'arme de votre ennemi en la frappant avec votre gorge "
 "a échoué."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "Voulez-vous que vos biens soient identifiés ?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "Vaporisé."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "Il semble que l'on vous ait rendu votre tête."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Vous avez encore bien râté, jetez votre corps aux oubliettes et prenez en un "
 "autre."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "Vous n'existez plus."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "Vous avez cessez d'exister."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "Tu es fini. Tu es parti retrouver ton créateur."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "Tu es un dur."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "Privé de toute essence de vie, vous reposez en paix."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Si tu n'étais pas autant en forme, tu serais en train de manger les "
 "pissenlits par la racine."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "Vos processus métaboliques appartiennent au passé maintenant."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr "Tu es en dehors des clous"
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "Tu viens de toucher le fond."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -2766,292 +3324,459 @@ msgstr ""
 "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
 "l'armée de l'ombre."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 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:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "Message"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 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:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "Vous avez ramassé "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr "Equiper en premier les flèches"
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Echange non réalisé !"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Emote non realisé !"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Vous n'avez pas pu vous assoir !"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Vous n'avez pas pu créer la conversation !"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 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:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "Pas assez de PV !"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "PV insuffisant !"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Vous n'avez pas de messages !"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez faire cela maintenant !"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire cela !"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "Hé ? Qu'est-ce donc que cela ?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "Enchainement échoué..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Vous n'avez rien pu voler..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Le poison fut sans effet..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 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:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Echange impossible. Ce personnage n'existe pas."
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Echange annulé pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Echange : Vous et %s"
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Echange avec %s annulé."
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr "Echange non pris en compte."
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 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:203
+#: src/net/ea/tradehandler.cpp:207
 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:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "Echange annulé."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "Echange finalisé."
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "Press OK to respawn."
 msgstr " Cliquer sur OK pour ressuciter"
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
 msgstr "Vous êtes mort"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "Déjà connecté"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Ce nom d'utilisateur existe déjà"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Caractéristiques du personnage Ok"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Caractéristiques du personnage Ok"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Personnage supprimé"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Choisissez le nombre d'objets à troquer."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Erreur inconnue"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "Pas de serveur de jeu disponible."
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Volonté :"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr "Sujet : %s"
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Le joueur touche le monstre"
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Commande : /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:207
+#, fuzzy
+msgid "Listing channels."
+msgstr "Il vous est demandé de rejoindre le chan %s."
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s a rejoind le groupe."
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Commande inconnue."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "Volonté %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Volonté :"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "Guilde créée."
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr "Erreur lors de la création de la guilde."
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr "Invitation envoyée."
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr "La promotion de ce membre a réussie."
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr "Echec lors de la promotion du membre"
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
 msgstr "Mauvaise empreinte magique"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "Déjà connecté"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "Le serveur est plein"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "Nouveau mot de passe incorrect"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "Compte non connecté. Identifiez-vous tout d'abord."
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "Nouvelle adresse email incorrecte"
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "Ancienne adresse email incorrecte"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "Cette nouvelle adresse email existe déjà."
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "La version de votre client est trop ancienne."
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "Mauvais nom d'utilisateur ou mot de passe."
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "Mauvais nom d'utilisateur, mot de passe ou adrese email."
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "Ce nom d'utilisateur existe déjà"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "Cette adresse email existe déjà"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr "Groupe rejoind."
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr "%s a rejoind le groupe."
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s a refusé votre invitation."
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr "Accepter les demandes d'échanges."
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorer les demandes d'échanges."
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr "Echange avec %s"
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Complètement ignorer %s@@"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3072,26 +3797,241 @@ msgstr "PV %+d"
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "Aonyme"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "anonyme"
 
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
+#~ msgid "no"
+#~ msgstr "non"
+
+#~ msgid "Buddy"
+#~ msgstr "Contact"
+
+#~ msgid "Buddy List"
+#~ msgstr "Liste de contacts"
+
+#~ msgid "Description: %s"
+#~ msgstr "Description : %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Effet : %s"
+
+#~ msgid "Previous"
+#~ msgstr "Précédent"
+
+#~ msgid "New"
+#~ msgstr "Nouveau"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Niveau de Compétences : %d"
+
+#~ msgid "Present: "
+#~ msgstr "Présent : "
+
+#~ msgid "Quit Guild"
+#~ msgstr "Quitter la guilde"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Recent:"
+#~ msgstr "Récent :"
+
+#~ msgid "Magic"
+#~ msgstr "Magie"
+
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Jeter le sort d'essai 1"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Jeter le sort d'essai 2"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Jeter le sort d'essai 3"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Armes à deux mains"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Troquer avec %s@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attaquer %s@@"
+
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Négliger%s@@"
+
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorer %s@@"
+
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Ne plus ignorer %s@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Kick player@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuler@@"
+
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Ramasser %s@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Déséquiper@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Équiper@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Utiliser@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Jeter@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Partager@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Magasin@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Retirer@@"
+
+#~ msgid "Select Server"
+#~ msgstr "Sélectionner un serveur"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "Impossible de passer à "
+
+#~ msgid "windowed"
+#~ msgstr "fenetré"
+
+#~ msgid "fullscreen"
+#~ msgstr "plein écran"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "Aptitude mystérieuse"
+
+#~ msgid "Weapons"
+#~ msgstr "Armes"
+
+#~ msgid "Crafts"
+#~ msgstr "Metiers"
 
-#~ msgid "Select Character"
-#~ msgstr "Sélectionner votre personnnage"
+#~ msgid "Stats"
+#~ msgstr "Statut"
 
-#~ msgid "MiniMap"
-#~ msgstr "Plan"
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Cost"
+#~ msgstr "Coût"
+
+#~ msgid "Attack:"
+#~ msgstr "Attaque :"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Réflexe :"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Point(s) de statut restant(s) : %d"
+
+#~ msgid "Max level"
+#~ msgstr "Niveau max."
+
+#~ msgid "curl error "
+#~ msgstr "Courbe d'erreur "
+
+#~ msgid " host: "
+#~ msgstr " hôte : "
+
+#~ msgid "Guilds"
+#~ msgstr "Guildes"
+
+#~ msgid "Buddys"
+#~ msgstr "Contacts"
+
+#~ msgid "Party Window"
+#~ msgstr "Fenêtre de groupe"
+
+#~ msgid "Unarmed"
+#~ msgstr "Désarmé"
+
+#~ msgid "Knife"
+#~ msgstr "Couteau"
+
+#~ msgid "Sword"
+#~ msgstr "Épée"
+
+#~ msgid "Polearm"
+#~ msgstr "Pique"
+
+#~ msgid "Staff"
+#~ msgstr "Bâton"
+
+#~ msgid "Whip"
+#~ msgstr "Fouet"
+
+#~ msgid "Bow"
+#~ msgstr "Arc"
+
+#~ msgid "Shooting"
+#~ msgstr "Tirer"
+
+#~ msgid "Mace"
+#~ msgstr "Masse"
+
+#~ msgid "Axe"
+#~ msgstr "Hache"
+
+#~ msgid "Thrown"
+#~ msgstr "Lancé"
+
+#~ msgid "Craft"
+#~ msgstr "Métier"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "Compétence inconnue"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr ""
+#~ " ne peut pas être créé, mais il n'existe pourtant pas ! Fermeture du "
+#~ "programme."
+
+#~ msgid "Couldn't set "
+#~ msgstr "Impossibler d'assigner "
+
+#~ msgid " video mode: "
+#~ msgstr " mode d'affichage "
+
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "Connexion au serveur de personnages..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Connexion au serveur de comptes..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias de création"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Commande : /new <party-name>"
+
+#~ msgid "a"
+#~ msgstr "un(e)"
+
+#~ msgid "Unnamed"
+#~ msgstr "Aonyme"
+
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Rayon du défilement"
@@ -3147,9 +4087,6 @@ msgstr "anonyme"
 #~ msgid "Emote Window"
 #~ msgstr "Fenêtre d'emote"
 
-#~ msgid "Player deleted"
-#~ msgstr "Personnage supprimé"
-
 #~ msgid "items.xml"
 #~ msgstr "items.xml"
 
@@ -3158,9 +4095,3 @@ msgstr "anonyme"
 
 #~ msgid "; "
 #~ msgstr "; "
-
-#~ msgid "+"
-#~ msgstr "+"
-
-#~ msgid "-"
-#~ msgstr "-"
diff --git a/po/he.po b/po/he.po
index c7bf14c6..853ae5f5 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"POT-Creation-Date: 2010-03-05 21:33+0100\n"
 "PO-Revision-Date: 2009-06-02 15:28+0000\n"
 "Last-Translator: Ddorda <d.dorda@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -17,199 +17,315 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-08 19:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "הגדרות"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "מתחבר לשרת המפה..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "התחברות"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "בחר שחקן"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "מתחבר לשרת המפה..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "שגיאה"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "סיסמה:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "שנה"
+
+#: src/client.cpp:863
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "החבר קודם בהצלחה."
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "בטל רישום"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "שרת עדכון פגום: "
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "שגיאה ביצירת ספריית העדכונים!"
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "פקודה לא ידועה."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- עזרה --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > הצג עזרה זו"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > הצג את שם המפה"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > הצג את מספר המשתמשים המחוברים"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > אמור משהו על עצמך"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > נקה את חלון זה"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > שלח הודעה פרטית למשתמש"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > שם נוסף ל-msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > שם נוסף ל-msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > יוצר לשונית עבור הודעות פרטיות עם משתמש אחר"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > שם נוסף ל-query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > הצג את כל החדרים הציבוריים"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > צור או הצטרף לחדר"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > יוצר מסיבה חדשה"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > הזמן משתמש לחגיגה"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > התחל להקליט את השיחה לקובץ חיצוני"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > קובע אם <אנטר> סוגר את תיבת הטקסט של הצ'אט"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > קבל את רשימת הנמצאים (ישלח לרישום, אם פעיל)"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > הודעה גלובאלית (GM בלבד)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr "למידע נוסף, הקלד /help <command>."
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "פקודה: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "פקודה זו מציגה רשימה של כל הפקודות האפשריות."
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "פקודה: /help <command>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "פקודה זו מציגה עזרה על <command>."
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "פקודה: /announce <msg>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** זמין ל-GM בלבד ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "This command sends the message <msg> to all players currently online.\r\n"
 "פקודה זו שולחת את ההודעה <msg> לכל השחקנים המחוברים."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "פקודה: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "פקודה זו מנקה את רישום השיחה הקודמת."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "פקודה: /item <policy>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "פקודה: /join <channel>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "פקודה זו מכניסה אותך אל <channel>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "אם <channel> אינו קיים, הוא נוצר."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "פקודה: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "פקודה זו מציגה את רשימת כל החדרים."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "פקודה: /me <message>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "פקודה זו תאמר לאחרים שאתה (עושה) <msg>."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "פקודה: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "פקודה: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "פקודה: /w <nick> <message>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "פקודה זו שולחת את הטקסט <message> אל <nick>."
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "אם <nick> מכיל רווחים בתוכו, תחום אותו במרכאות כפולות (\")."
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "פקודה: /query <nick>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "פקודה: /q <nick>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "הפקודה מנסה ליצור לשונית עבור מסרים בינך לבין <nick>."
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "פקודה: /create <party-name>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "פקודות את יוצרות חגיגה בשם <party-name>."
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "פקודה: /party <nick>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "פקודה זו מזמינה את <nick> לחגוג איתך."
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "פקודה: /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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."
@@ -217,27 +333,27 @@ msgstr ""
 "פקודה זו מקבלת את רשימת המשתמשים המופיעים על המסך, ושולח אותה לרישום, אם "
 "הינך מקליט רישום, או אל השיחה."
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "פקודה: /record <filename>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "פקודה זו מתחילה להקליט רישום שיחה לקובץ <filename>."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "פקודה: /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr "פקודה זו מסיימת תהליך הקלטה."
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "פקודה: /toggle <state>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -245,7 +361,7 @@ msgstr ""
 "הפקודה קובעת אם מקש האנטר יסגור את תיבת הטקסט של הצ'אט או שהוא ייסגר באופן "
 "אוטומטי."
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -253,39 +369,48 @@ msgstr ""
 "<state> יכול להיות אחד משני משני מצבים. \"1\", \"yes\", \"ture\" כדי לשנות "
 "למצב פעיל, או \"0\", no\", falst\" כדי לשנות למצב כבוי."
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "פקודה: /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr "הפקודה מציגה את מצב סגירת הטקסט האוטומטית."
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "פקודה: /item <policy>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "פקודה: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "פקודה זו מציגה את שם המפה הנוכחית."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "פקודה: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "הקלד /help לרשימת הפקודות."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "לא ניתן לשלוח לחישות ריקות!"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -294,312 +419,349 @@ msgstr ""
 "לא ניתן ליצור לשונית לחישות עבור הכינוי \"%s\"! הלשונית כבר קיימת או שמדובר "
 "בך."
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "מבקש להצטרף לחדר %s."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "שם חגיגה חסר."
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "סגירת תיבת הטקסט האוטומטית."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "ההודעה סוגרת את תיבת הטקסט."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "מקש האנטר כעת סוגר את תיבת הטקסט."
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "ההודעה כעת סוגרת את תיבת הטקסט."
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "הגיגה נוצרה בהצלחה."
+
+#: src/commandhandler.cpp:486
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "האפשרויות עבור /%s הינם \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/engine.cpp:88
-msgid "Could not load map"
-msgstr "לא ניתן לטעון את המפה"
-
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
-msgstr "שגיאה בעת טעינת %s"
-
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr "כללי"
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "תמונת־מסך נשמרה במיקום ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr "החיבור לשרת נכשל, התוכנה תסגר כעת"
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "יציאה"
-
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "האם אתה בטוח שברצונך לצאת?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr "לא"
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "מתעלם מהצעות סחר נכנסות"
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "חבר"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "לא ניתן לטעון את המפה"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr "שגיאה בעת טעינת %s"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "רשימת חברים"
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "חגיגה (%s)"
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
-msgstr "מקסימום"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "תיאור: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "יציאה"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr "מקסימום"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "חנות"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "מכר"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "בטל"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "שנה כתובת דואר אלקטרוני"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "משתמש: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
 msgstr "הקלד כתובת דוא\"ל חדשה פעמיים:"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "הקלד סיסמה חדשה פעמיים:"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "הקלד סיסמה חדשה פעמיים:"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "צור שחקן"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "שם:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "צבע שיער:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "תיספורת:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "צור"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "זכר"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "נקבה"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, 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:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "שגיאה"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "יש להכניס לפחות 4 תוים בשם."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "נתוני שחקן - אישור"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "אנא הסר %d נקודות"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "ניהול משתמש ושחקן"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "אישור"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "הקודם"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "הבא"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "שם: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "רמה: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "בטל רישום"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "חדש"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "שנה כתובת דואר אלקטרוני"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "בטל רישום"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "זהב: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "רמת עבודה: %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "סגור"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "כסף: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "שיחה"
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "%d משתמשים נוכחים."
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "נוכחים: "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "מקליט שמות נוכחים לרישום."
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
@@ -612,180 +774,222 @@ msgstr "כן"
 msgid "No"
 msgstr "לא"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "מתחבר..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "לבוש"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "הורד"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
-msgstr "גילדה"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "כותרת: %s"
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
-msgstr "צור גילדה"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "שם: %s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
-msgstr "הזמן משתמש"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "חלון מיני מפה"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "אפקטים חלקיים"
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "מידע חלקי"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "אופף FX"
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
-msgstr "עזוב גילדה"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "לבוש"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "הורד"
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "עזרה"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "סגור"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "ציוד"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "השלך"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "פצל"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "בשימוש:"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "משקל:"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "השלך"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "אישור"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "הכל"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "בחר כמות חפצים לאחסן."
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "בחר כמות חפצים להחזיר."
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצים לפצל."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "משקל: "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "זכור שם משתמש"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 "קסם"
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr "הטל קסם נסיון 1"
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr "הטל קסם נסיון 2"
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr "הטל קסם נסיון 3"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "שרת"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "מפה"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "ממתין לשרת"
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "הבא"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr "שלח"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr "אפס"
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "הבא"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr "אל:"
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "שלח"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח או המכתב בעלי שגיאה."
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "הורד"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "טקסט"
 
@@ -801,325 +1005,302 @@ msgstr "מתאר הטקסט"
 msgid "Progress Bar Labels"
 msgstr "תוויות סרגל התקדמות"
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "רקע"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr "הדגשה"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr "לשונית הדגשה"
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+#, fuzzy
+msgid "Item Too Expensive"
 msgstr "החפץ יקר מדי"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+#, fuzzy
+msgid "Item Is Equipped"
 msgstr "החפץ בשימוש"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "GM"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "שחקן"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "לחישה"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "הינו"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr "חגיגה"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "גילדה"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr "שרת"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "רישום"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "קישור"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr "נהיה"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "שמות המשתמשים האחרים"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "השם שלך"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "שמות המנהלים"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "דמויות"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "מפלצות"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr "סוג חפץ לא ידוע"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr "כלליים"
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr "כובעים"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr "שימושיים"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr "חולצות"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+#, fuzzy
+msgid "One Handed Weapons"
 msgstr "נשקים ליד אחת"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "מכנסיים"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "נעליים"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
-msgstr "נשקים לשתי ידיים"
+#: src/gui/palette.cpp:122
+#, fuzzy
+msgid "Two Handed Weapons"
+msgstr "נשקים ליד אחת"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr "מגנים"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "טבעות"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr "שרשראות"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr "ידיים"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "תחמושת"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr "אפקטים חלקיים"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr "הודעה על לקיחה"
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr "הודעה על נק' נסיון"
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+#, fuzzy
+msgid "Player Hits Monster"
 msgstr "משתמש מכה מפלצת"
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+#, fuzzy
+msgid "Monster Hits Player"
 msgstr "משתמש מכה משתמש"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr "מכה קריטית"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr "פספוס"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr "סרגל חיים"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr "3/4 סרגל חיים"
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr "1/2 סרגל חיים"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr "1/4 סרגל חיים"
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr "חגיגה (%s)"
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr "התקבלה הזמנה למסיבה, אך הזמנה זהה כבר קיימת."
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s הזמין אותך לחגיגה שלהם."
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s הזמין אותך להצטרף לחגיגת ה-%s."
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr "אשר את הזמנת החגיגה"
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr "אשר את ההזמנה של %s."
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr "דחה את ההזמנה של %s."
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|הוסף שם לשיחה@@"
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "סוחר עם%s"
 
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|סחור עם %s@@"
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "התקפה %+d"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|תקוף את %s@@"
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "לחישה"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+#: src/gui/popupmenu.cpp:101
+#, fuzzy, c-format
+msgid "Befriend %s"
 msgstr "@@friend|הצע חברות %s@@"
 
-#: src/gui/popupmenu.cpp:99
-#, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|זלזל %s@@"
+#: src/gui/popupmenu.cpp:106
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "מזלזל"
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore|התעלם %s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "מתעלם"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
-msgstr "@@unignore|אל-התעלם %s@@"
+msgid "Unignore %s"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:118
+#, fuzzy, c-format
+msgid "Completely ignore %s"
 msgstr "@@ignore|התעלם לחלוטין %s@@"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
 msgstr "@@guild|הזמן את %s להצטרף לגילדה@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|הזמן את %s להצטרף לחגיגה@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|העף שחקן@@"
+#: src/gui/popupmenu.cpp:144
+#, fuzzy
+msgid "Kick player"
+msgstr "העפה נכשלה!"
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:153
+#, fuzzy, c-format
+msgid "Talk to %s"
 msgstr "@@talk|דבר אל %s@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+#, fuzzy
+msgid "Kick monster"
 msgstr "@@admin-kick|העף מפלצת@@"
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|ביטול@@"
+#: src/gui/popupmenu.cpp:174
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|הוסף שם לשיחה@@"
 
-#: src/gui/popupmenu.cpp:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|הרם %s@@"
+#: src/gui/popupmenu.cpp:191
+#, fuzzy, c-format
+msgid "Pick up %s"
+msgstr "הרם"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#, fuzzy
+msgid "Add to chat"
 msgstr "@@chat|הוסף לשיחה@@"
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@use|הפשט@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|השתמש@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Use@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|השלך@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|פצל@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
-msgstr "@@store|אחסן@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr "אחסן"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|החזר@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
+msgstr "החזר"
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "החלף שרת"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "החלף שחקן"
 
@@ -1139,137 +1320,189 @@ msgstr "כבר מקליט."
 msgid "Starting to record..."
 msgstr "מתחיל להקליט..."
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr "שגיאה בהתחלת ההקלטה."
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr "מקליט..."
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr "מפסיק להקליט"
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "אשר:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "דוא\"ל:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+#, fuzzy
+msgid "Choose Your Server"
 msgstr "בחר את השרת שלך"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "שרת:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "פורט:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "שרת:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "מתחבר..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "סמן-עכבר מותאם"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "בחר שרת"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "הגדרות"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "אשר"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "ממתין לשרת"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "אתחל חלונות"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "צליל"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "שמע"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "ללא טקסט"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr "כך הצבע נראה"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "צבעים"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+#, fuzzy
+msgid "Type:"
 msgstr "סוג: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr "סטטי"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "פעימה"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "קשת בענן"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "מינסרה"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
 msgstr "עיכוב: "
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+#, fuzzy
+msgid "Red:"
 msgstr "אדום: "
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
 msgstr "ירוק: "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+#, fuzzy
+msgid "Blue:"
 msgstr "כחול: "
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "אשר"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "אתחל חלונות"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
@@ -1310,430 +1543,621 @@ msgstr "ברירת מחדל"
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "שם"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "התנהגות"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "ניטרלי"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "חבר"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "מזלזל"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "מתעלם"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "אפשר מסחר"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "אפשר לחישות"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr "הכנס את כל הלחישות ללשוניות"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "הצג שם"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "שחקנים"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "כאשר מתעלם:"
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr "מזערי"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "קטן"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "בינוני"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr "גדול"
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr "ללא טקסט"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "בועות, ללא שמות"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr "בועות עם שמות"
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "כבוי"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "נמוך"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "גבוה"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "בינוני"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "מקסימלי"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "מסך מלא"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "‏OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "סמן-עכבר מותאם"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "שמות גלויים"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "אפקטים חלקיים"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+#, fuzzy
+msgid "Show own name"
 msgstr "הצג שם"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr "הצג התרעת לקיחה"
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr "בשיחה"
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr "באופן חלקי"
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "הגבלת FPS:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "וידאו"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "הצג שם"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr "טקסט מעל הראש"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "אטימות Gui"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "אופף FX"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "מידע חלקי"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr "גודל הגופן"
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "נכשל במעבר אל "
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "חלון"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "לא"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
-msgstr "מסך מלא"
+#: src/gui/setup_video.cpp:381
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "מצב ושיחזור מצב ישן נכשלו!"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "מצב ושיחזור מצב ישן נכשלו!"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "מחליף למסך מלא"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "משנה OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "אישור שינויים עבור OpenGL דורש איתחול."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "רזולוצית המסך השתנתה"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr "טען מחדש כדי שהשינוי יחול."
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_video.cpp:522
+#, fuzzy
+msgid "Particle Effect Settings Changed."
 msgstr "הגדרות השינוי החלקי השתנו."
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:523
 msgid "Changes will take effect on map change."
 msgstr "השינויים יחולו על שינוי המפה."
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "כישור מיסתורי"
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 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
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "למעלה"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
-msgstr "נשקים"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "נקודות כישורים:  %d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "נקודות כישורים:  %d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "כישורים"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "רמה: %d"
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
-msgstr "מלאכה"
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "רמה: %d"
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:117
 #, c-format
-msgid "Job: %d"
-msgstr "עבודה: %d"
+msgid "Invited user %s to guild %s."
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
-msgstr "חיים:"
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "גילדה נוצרה."
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
-msgstr "נסיון:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
-msgstr "קסם:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
-msgstr "עבודה:"
+#: src/gui/socialwindow.cpp:146
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "צור גילדה"
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "רמות"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "האם אתה בטוח שברצונך לצאת?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "סה\"כ"
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > הזמן משתמש לחגיגה"
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "עלות"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "התקפה:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > הזמן משתמש לחגיגה"
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "הגנה:"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "התקפת קסם:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "הגנת קסם:"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "האם אתה בטוח שברצונך לצאת?"
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% דיוק:"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "צור גילדה"
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% התחמקות:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "צור שחקן"
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% ריפלקס:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "עוצמה"
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "הזמן משתמש"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "זריזות"
+#: src/gui/socialwindow.cpp:298
+#, fuzzy
+msgid "Leave"
+msgstr "גדול"
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "חיוניות"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "אשר את ההזמנה של %s."
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "תבונה"
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "דחה את ההזמנה של %s."
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "מיומנות"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "אשר את ההזמנה של %s."
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "מזל"
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "דחה את ההזמנה של %s."
+
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "שגיאה ביצירת גילדה."
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "נקודות מצב נותרות: %d"
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
-msgstr "רמה מקסימלית"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "גילדה"
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
-msgstr "איחסון"
+#: src/gui/socialwindow.cpp:485
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "בחר את השרת שלך"
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
-msgstr "אחסן"
+#: src/gui/socialwindow.cpp:497
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "התקבלה הזמנה למסיבה, אך הזמנה זהה כבר קיימת."
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
-msgstr "החזר"
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s הזמין אותך להצטרף לחגיגת ה-%s."
+
+#: src/gui/socialwindow.cpp:507
+#, fuzzy
+msgid "Accept Guild Invite"
+msgstr "אשר את הזמנת החגיגה"
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr "התקבלה הזמנה למסיבה, אך הזמנה זהה כבר קיימת."
+
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s הזמין אותך לחגיגה שלהם."
 
-#: src/gui/trade.cpp:51
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s הזמין אותך להצטרף לחגיגת ה-%s."
+
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s הזמין אותך לחגיגה שלהם."
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s הזמין אותך להצטרף לחגיגת ה-%s."
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr "אשר את הזמנת החגיגה"
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+#, fuzzy
+msgid "Party Name"
+msgstr "חגיגה"
+
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "בחר את השרת שלך"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "רמה: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "כסף: %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr "חיים:"
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr "נסיון:"
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr "קסם:"
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "עבודה: %d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr "עבודה:"
+
+#: src/gui/statuswindow.cpp:194
+#, fuzzy
+msgid "HP"
+msgstr "חיים:"
+
+#: src/gui/statuswindow.cpp:200
+#, fuzzy
+msgid "MP"
+msgstr "קסם:"
+
+#: src/gui/statuswindow.cpp:206
+#, fuzzy
+msgid "Exp"
+msgstr "נסיון:"
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "זהב: %d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "עבודה:"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "נתוני שחקן - אישור"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "נקודות כישורים:  %d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "רמה: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr "איחסון"
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "מציע לחור"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr "אושר. ממתין..."
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr "הסכם למסחר"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr "מוסכם. ממתין..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "סחור: אתה"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "סחרר"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "הוסף"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
 msgstr "אתה מקבל %s."
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "אתה נותן:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "שנה"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "שם: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "מעדכן..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "מתחבר..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "שחק"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "שגיאת קיפולים: "
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " שרת מארח: "
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1  תהליך העדכון לא תם."
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1  מומלץ ביותר שתנסה שוב מאוחר יותר"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "-"
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "הסתיים"
 
@@ -1785,635 +2209,742 @@ msgstr "הפקודה מוציאה אותך מהחדר הנוכחי."
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "אם הינך האדם האחרון בחדר, הוא יימחק."
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "פקודה: /op <nick>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr "פקודה זו הופכת את <nick> למנהל החדר."
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "מנהלי חדר יכולים להעיף משתמשים ולהפוך משתמשים אחרים בחדר למנהלים."
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "פקודה: /kick <nick>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr "פקודה זו גורמת ל-<nick> לעזוב את החדר."
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "צריך משתמש שינהל!"
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr "צריך משתמש שיעיף!"
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "הודעה גלובאלית:"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "הודעה גלובאלית מאת %s:"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
 msgstr "%s: לוחש: "
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr "לא ניתן לשלוח הודעה ריקה!"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr "/close > סוגר את לשונית הלחישות"
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr "פקודה: /close"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr "הפקודה סוגרת את לשונית הלחישות הנוכחית."
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "מצב"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "פקודה: /item"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "גילדות"
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "פקודה זו מציגה את מספר השחקנים המחוברים כרגע."
+
+#: src/gui/widgets/whispertab.cpp:94
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "פקודה זו מתחילה להקליט רישום שיחה לקובץ <filename>."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr "חברים"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "מצב"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "קיצור־דרך"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "בחר אישור"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "שנה"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "בחר את השרת שלך"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr "הזז למעלה"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr "הזז למטה"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr "הזז שמאלה"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr "הזז ימינה"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr "תקוף"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr "כוון ותקוף"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr "חייך"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr "דבר"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr "הפסק לתקוף"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
 msgstr "כוון לקרוב ביותר"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr "כוון לדמות"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr "כוון לשחקן"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr "הרם"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr "הסתר חלונות"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr "שב"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr "אפשר/בטל מסחר"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr "מצא נתיב לעכבר"
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "קיצור־דרך לחפץ %d"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr "חלון עזרה"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr "חלון ציוד"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr "חלון לבוש"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr "חלון כישורים"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr "חלון מיני מפה"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr "חלון שיחה"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr "חלון קיצור־דרך לחפץ"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr "חלון הגדרות"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr "חלון ניפוי"
 
-#: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr "חלון חגיגה"
+#: src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Social Window"
+msgstr "חלון כישורים"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr "חלון קיצור־דרך לרגישון"
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "חלון מצב"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "קיצור־דרך לריגשון %d"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr "סגירת הצ'אט"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr "גלול שיחה למעלה"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr "גלול שיחה למטה"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr "לשונית השיחה הקודמת"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr "לשונית השיחה הבאה"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr "בחר אישור"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr "קלט התעלמות 1"
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr "קלט התעלמות 2"
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr "ללא תחמושת"
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr "סכין"
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr "חרב"
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr "נשק מוט"
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr "מקל"
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr "שוט"
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr "קשת"
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr "ירייה"
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr "שרביט"
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr "גרזן"
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr "זריקה"
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr "מלאכה"
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr "כישור לא ידוע"
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr "שרת עדכון פגום: "
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr "שגיאה ביצירת ספריית העדכונים!"
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr " can't be created, but it doesn't exist! Exiting."
-
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "לא ניתן להגדיר "
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "פתור אותם, אחרת המשחק עלול להתנהג באופן מוזר."
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr " מצב וידאו: "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
+msgstr "לא ניתן להרים את החפץ."
 
-#: src/main.cpp:575
-msgid "mana"
-msgstr "mana"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "הרמת %s [@@%d|%s@@]."
+msgstr[1] "הרמת %s [@@%d|%s@@]."
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr "אפשרויות:"
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr "  -C --config-file : Configuration file to use"
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr "  -d --data        : Directory to load game data from"
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version     : Display the version"
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Display this help"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
-msgstr "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Configuration file to use"
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
-msgstr "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username    : Login with this username"
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Login with this password"
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Login with this character"
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
-msgstr "  -p --port        : Login server port"
-
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Login server name or IP"
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
-msgstr "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port        : Login server port"
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
-msgstr "  -U --username    : Login with this username"
+#: src/main.cpp:53
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Use this update host"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:54
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default     : Choose default character server and character"
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
-msgstr "  -v --version     : Display the version"
+#: src/main.cpp:56
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Skip the update downloads"
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "מתחבר לשרת המפה..."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data        : Directory to load game data from"
+
+#: src/main.cpp:58
+#, fuzzy
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "מתחבר לשרת השחקן..."
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir    : Directory to use as home directory"
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "מתחבר לשרת החשבון..."
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl   : Disable OpenGL for this session"
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr "העפה נכשלה!"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr "העפה הצליחה!"
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr "אין מה למכור."
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr "תודה על הקנייה."
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr "לא ניתן לקנות."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr "תודה על המכירה."
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr "לא ניתן למכור."
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+#, fuzzy
+msgid "Access denied."
 msgstr "הגישה נדחתה"
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
 msgstr "לא ניתן להשתמש ב-ID זה."
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown failure to select character."
 msgstr "שגיאה לא ידועה בבחירת השחקן"
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "נכשל ביצירת השחקן. ייתכן כי שם זה כבר תפוס."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr "מידע"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr "השחקן נמחק."
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr "נכשל במחיקת השחקן."
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "עוצמה:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "זריזות:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "חיוניות:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "תבונה:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "מיומנות:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr "מזל:"
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr "הלחישה לא יכלה להשלח, המשתמש אינו מחובר."
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr "הלחישה לא יכלה להשלח, מהמשתמש מתעלם."
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "שחקן"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr "חדרים אינם נתמכים!"
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
-msgstr "לא ניתן ללבוש."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr "לא ניתן להסיר."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "שם"
+
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "בקשה למסחר"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "עוצמה %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr "זריזות %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "חיוניות %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "תבונה %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr "מיומנות %+d"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "מזל %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
 msgstr "האימות נכשל"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
 msgstr "אין שרתים זמינים"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+#, fuzzy
+msgid "Someone else is trying to use this account."
 msgstr "אדם אחר מנסה להשתמש בחשבון זה"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+#, fuzzy
+msgid "This account is already logged in."
 msgstr "חשבון זה כבר מחובר"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+#, fuzzy
+msgid "Speed hack detected."
 msgstr "פריצת מהירות זוהתה"
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+#, fuzzy
+msgid "Duplicated login."
 msgstr "התחברות כפולה"
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
 msgstr "שגיאת חיבור לא ידועה"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "נותקת מהשרת!"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "עוצמה"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "זריזות"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "חיוניות"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "תבונה"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "מיומנות"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "מזל"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "הגנה:"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "התקפת קסם:"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "הגנת קסם:"
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% דיוק:"
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% התחמקות:"
+
+#: src/net/ea/generalhandler.cpp:229
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "מכה קריטית"
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > מציג עזרה זו."
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
-msgstr "/create > יוצר מסיבה חדשה"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > הזמן שחקן לחגיגה שלך"
+
+#: src/net/ea/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > עזוב את החגיגה בה אתה נמצא"
+
+#: src/net/ea/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > העף מישהו מהחגיגה בה אתה נמצא"
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "פקודה: /invite <nick>"
+
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "פקודה זו מזמינה את <nick> לחגוג איתך."
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "פקודה: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "פקודה זו גורמת לשחקן לעזוב את החגיגה."
+
+#: src/net/ea/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "שם חגיגה חסר."
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
-msgstr "/new > שם נוסף ל-create"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s הצטרף לחגיגה."
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "תגובה לא ידועה להזמנה עבור %s."
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > הזמן שחקן לחגיגה שלך"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > עזוב את החגיגה בה אתה נמצא"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > העף מישהו מהחגיגה בה אתה נמצא"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > הצג/שנה את אפשרויות השיתוף של חפץ־חגיגה"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > הצג/שנה את אפשרויות שיתוף הנסיון בחגיגה"
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
-msgstr "פקודה: /new <party-name>"
-
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
-msgstr "פקודה: /create <party-name>"
-
-#: 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:77
-msgid "Command: /invite <nick>"
-msgstr "פקודה: /invite <nick>"
-
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
-msgstr "פקודה: /leave"
-
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "פקודה זו גורמת לשחקן לעזוב את החגיגה."
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "פקודה: /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "הפקודה משנה את מדיניות השיתוף של חפצי החגיגה."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2421,23 +2952,23 @@ msgstr ""
 "<policy> יכול להיות אחד מ- \"1\", \"yes\", \"true\" כדי לאפשר שיתוף חפץ, או "
 "\"0\", \"no\", \"false\" כדי לבטל שיתוף חפץ."
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "פקודה: /item"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "הפקודה מציגה את מדיניות השיתוף של חפצי החגיגה."
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "פקודה: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "פקודה זו משנה את מדיניות שיתוף הנסיון בחגיגות."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2445,102 +2976,109 @@ msgstr ""
 "<policy> יכול להיות  \"1\", \"yes\", \"true\" כדי לאפשר שיתוף נסיון, או \"0"
 "\", \"no\", \"false\" כדי לבטל שיתוף נסיון."
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "פקודה: /exp"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "פקודה זו מציגה את מדיניות שיתוף הנסיון הנוכחית בחגיגות."
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr "שם חגיגה חסר."
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr "שיתוף חפצים מאופשר."
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr "שיתוף חפצים מבוטל."
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr "שיתוף חפצים לא אפשרי."
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "שיתוף חפצים מאופשר."
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr "שיתוף נסיון מאופשר."
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr "שיתוף נסיון מבוטל."
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr "שיתוף נסיון לא אפשרי."
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
-msgstr "לא ניתן להרים את החפץ."
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
-msgstr "‎"
-
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "הרמת %s [@@%d|%s@@]."
+#: src/net/ea/gui/partytab.cpp:176
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "שיתוף נסיון מאופשר."
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:281
 msgid "Failed to use item."
 msgstr "נכשל בשימוש בחפץ."
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
+msgstr "לא ניתן ללבוש."
+
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr "לא ניתן להסיר."
+
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr "החשבון לא נמצא. אנא נסה להתחבר שנית."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
 msgstr "הסיסמה הישנה שגויה"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+#, fuzzy
+msgid "New password too short."
 msgstr "הסיסמה החדשה קצרה מדי"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
 msgstr "שגיאה לא ידועה"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
 msgstr "ID לא רשום"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
 msgstr "סיסמה שגויה"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+#, fuzzy
+msgid "Account expired."
 msgstr "המשתמש מושהה"
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
 msgstr "הועפת מהשרת"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
+#, fuzzy
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr "הורחקת לצמיתות מן המשחק. אנא צור קשר עם צוות המנהלים."
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2549,448 +3087,634 @@ msgstr ""
 "הורחקת זמנית מן המשחק עד %s.\n"
 "אנא צור קשר עם צוות המנהלים באמצעות מערכת הפורומים."
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
 msgstr "שם המשתמש כבר נלקח"
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "לא ניתן למכור."
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "מתחבר לשרת המפה..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "לא היה ניתן ליצור חגיגה."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "הגיגה נוצרה בהצלחה."
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s כבר נמצא בחגיגה."
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s דחה את הזמנתך."
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s הצטרף לחגיגה."
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "תגובה לא ידועה להזמנה עבור %s."
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr "עזבת את החגיגה."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr "%s עזב את החגיגה שלך."
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "משתמש לא ידוע ניסה לומר: %s"
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr "הזמנה בדרך זו אינה נתמכת כרגע."
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s אינו נמצא בחגיגתך!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "אתה מת."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "צר לנו לבשר לכם כי שחקנכם נהרג בקרב."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "אינך חי כל־כך כרגע."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "קור ידיו של המוות הקודר אוחזים בנשמתך."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "המשחק נגמר!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr "הכנס מטבע כדי להמשיך."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "לא, ילדים. השחקן שלכם לא באמת מת. הוא... אה... הלך למקום טוב יותר."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "תוכניתך לשבור את נשק האויב באמצות צווארך נכשלה."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "אני מניח שלא הלך לך כל־כך טוב."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "האם ברצונך שיאתרו את חלקי גופתך?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "באופן מצער, מעולם לא נמצא זכר ממך..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "הושמדתך."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "נראה כאילו ראשך נמסר אליך."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "פישלת שוב, גופתך תיזרק לצינוק ותקבל אחת חדשה."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "אינך מת עדיין. אתה רק נח."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "אינך יותר."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "חדלת מלהתקיים."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "התפוגגת ועברת לפגוש את הבורא."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "אינך מת עדיין. אתה רק נח."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "נטול חיים, את נח על משכבך."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "אתה לא מת עדיין! אה.. טוב, עכשיו כן."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "חילוף החומרים שלך הפך להיסטוריה."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr "אתה מכה כמו גופה."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "חדלת מלהתקיים."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "התפוגגת ועברת לפגוש את הבורא."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "הינך שחקן לשעבר."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr "אתה מת. טוב שיש חברת ביטוח..."
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "הודעה"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "אתה סוחב יותר מחצי ממשקלך. אינך יכול לאחות את החיים."
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "הרמת "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr "הצטייד בחצים תחילה."
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "המסחר נכשל!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "הבעה נכשלה!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "הישיבה נכשלה!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "יצירת שיחה נכשלה!"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "לא היה ניתן להצטרף לחגיגה!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "לא ניתן לצעוק!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "לא הגעת לרמה גבוהה מספיק!"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "לא נותרו נק' חיים!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "לא נותרו נק' קסם!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "אין תזכירים!"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "אינך יכול לעשות זאת כרגע!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "נראה שאתה צריך עוד כסף... ;-)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "אינך יכול להשתמש בכישור עם נשק זה!"
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "אתה צריך עוד אבן אדומה!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "אתה צריך עוד אבן כחולה!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "אתה סוחב יותר מדי בכדי לעשות זאת!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "הא? מה זה?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "הפיתול נכשל...."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "לא היה ניתן לגנוב דבר..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "לרעל לא הייתה כל השפעה..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "מסחר אינו אפשרי. השותף למסחר רחוק מדי."
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "מסחר אינו אפשרי. השחקן אינו קיים."
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "המסחר בוטל מסיבה לא ידועה."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr "מסחר: אתה ו-%s"
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "המסחר עם %s בוטל."
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr "המסחר נכשל"
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "נכשל בהוספת חפץ. השותף למסחר שוקל יותר מדי."
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "נכשל בהוספת חפץ. לשותף למסחר אין מקומות פנויים."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "נכשל בהוספת חפץ מסיבה לא ידועה."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "המסחר בוטל."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "המסחר הושלם."
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "Press OK to respawn."
 msgstr " לחץ אישור כדי להשיב"
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
 msgstr "נהרגת"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "כבר מחובר"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "שם המשתמש כבר בשימוש"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "נתוני שחקן - אישור"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "נתוני שחקן - אישור"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "השחקן נמחק."
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "בחר כמות חפצים לסחור."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "שגיאה לא ידועה"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "אין שרתי משחק זמינים."
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "כח רצון:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr "כותרת: %s"
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "משתמש מכה מפלצת"
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "פקודה: /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:207
+#, fuzzy
+msgid "Listing channels."
+msgstr "מבקש להצטרף לחדר %s."
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s הצטרף לחגיגה."
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "פקודה לא ידועה."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "כח רצון %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "כח רצון:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "גילדה נוצרה."
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr "שגיאה ביצירת גילדה."
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr "הזמנה נשלחה."
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr "החבר קודם בהצלחה."
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr "נכשל בקידום החבר."
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
 msgstr "magic_token שגוי"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "כבר מחובר"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "השרת מלא"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "הסיסמה החדשה שגויה"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "החשבון אינו מחובר. אנא קודם־כל התחבר."
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "כתובת דוא\"ל חדשה שגויה"
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "כתובת דוא\"ל ישנה שגויה"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "כתובת הדוא\"ל החדשה כבר בשימוש."
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "גרסת הקליינט ישנה מדי"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "שם משתמש או סיסמה שגויים"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "שם משתמש, סיסמה או דוא\"ל שגויים"
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "שם המשתמש כבר בשימוש"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "כתובת הדוא\"ל כבר בשימוש"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr "הצטרפת לחגיגה."
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr "%s הצטרף לחגיגה."
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s דחה את הזמנתך."
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr "מקבל בקשות מסחר נכנסות."
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr "מתעלם מבקשות סחר נכנסות."
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr "סוחר עם%s"
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|התעלם לחלוטין %s@@"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3011,20 +3735,236 @@ msgstr "חיים %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr "חפץ לא ידוע"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "ללא שם"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "ללא שם"
 
-#~ msgid "Select Character"
-#~ msgstr "בחר שחקן"
+#~ msgid "no"
+#~ msgstr "לא"
+
+#~ msgid "Buddy"
+#~ msgstr "חבר"
+
+#~ msgid "Buddy List"
+#~ msgstr "רשימת חברים"
+
+#~ msgid "Description: %s"
+#~ msgstr "תיאור: %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "השפעה: %s"
+
+#~ msgid "Previous"
+#~ msgstr "הקודם"
+
+#~ msgid "New"
+#~ msgstr "חדש"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "רמת עבודה: %d"
+
+#~ msgid "Present: "
+#~ msgstr "נוכחים: "
+
+#~ msgid "Quit Guild"
+#~ msgstr "עזוב גילדה"
+
+#~ msgid "Ok"
+#~ msgstr "אישור"
+
+#~ msgid "Recent:"
+#~ msgstr "לאחרונה:"
+
+#~ msgid "Magic"
+#~ msgstr "קסם"
+
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "הטל קסם נסיון 1"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "הטל קסם נסיון 2"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "הטל קסם נסיון 3"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "נשקים לשתי ידיים"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|סחור עם %s@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|תקוף את %s@@"
+
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|זלזל %s@@"
+
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|התעלם %s@@"
+
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|אל-התעלם %s@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|העף שחקן@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|ביטול@@"
+
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|הרם %s@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|הפשט@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|השתמש@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Use@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|השלך@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|פצל@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|אחסן@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|החזר@@"
+
+#~ msgid "Select Server"
+#~ msgstr "בחר שרת"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "נכשל במעבר אל "
+
+#~ msgid "windowed"
+#~ msgstr "חלון"
+
+#~ msgid "fullscreen"
+#~ msgstr "מסך מלא"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "כישור מיסתורי"
+
+#~ msgid "Weapons"
+#~ msgstr "נשקים"
+
+#~ msgid "Crafts"
+#~ msgstr "מלאכה"
+
+#~ msgid "Stats"
+#~ msgstr "רמות"
+
+#~ msgid "Total"
+#~ msgstr "סה\"כ"
+
+#~ msgid "Cost"
+#~ msgstr "עלות"
+
+#~ msgid "Attack:"
+#~ msgstr "התקפה:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% ריפלקס:"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "נקודות מצב נותרות: %d"
+
+#~ msgid "Max level"
+#~ msgstr "רמה מקסימלית"
+
+#~ msgid "curl error "
+#~ msgstr "שגיאת קיפולים: "
+
+#~ msgid " host: "
+#~ msgstr " שרת מארח: "
+
+#~ msgid "Guilds"
+#~ msgstr "גילדות"
+
+#~ msgid "Buddys"
+#~ msgstr "חברים"
+
+#~ msgid "Party Window"
+#~ msgstr "חלון חגיגה"
+
+#~ msgid "Unarmed"
+#~ msgstr "ללא תחמושת"
+
+#~ msgid "Knife"
+#~ msgstr "סכין"
+
+#~ msgid "Sword"
+#~ msgstr "חרב"
+
+#~ msgid "Polearm"
+#~ msgstr "נשק מוט"
+
+#~ msgid "Staff"
+#~ msgstr "מקל"
+
+#~ msgid "Whip"
+#~ msgstr "שוט"
+
+#~ msgid "Bow"
+#~ msgstr "קשת"
+
+#~ msgid "Shooting"
+#~ msgstr "ירייה"
+
+#~ msgid "Mace"
+#~ msgstr "שרביט"
+
+#~ msgid "Axe"
+#~ msgstr "גרזן"
+
+#~ msgid "Thrown"
+#~ msgstr "זריקה"
+
+#~ msgid "Craft"
+#~ msgstr "מלאכה"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "כישור לא ידוע"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " can't be created, but it doesn't exist! Exiting."
+
+#~ msgid "Couldn't set "
+#~ msgstr "לא ניתן להגדיר "
+
+#~ msgid " video mode: "
+#~ msgstr " מצב וידאו: "
+
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "מתחבר לשרת השחקן..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "מתחבר לשרת החשבון..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > שם נוסף ל-create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "פקודה: /new <party-name>"
+
+#~ msgid "a"
+#~ msgstr "‎"
+
+#~ msgid "Unnamed"
+#~ msgstr "ללא שם"
 
 #~ msgid "Scroll radius"
 #~ msgstr "תווך גלילה"
diff --git a/po/hr.po b/po/hr.po
index 7388a741..e783761a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,578 +17,722 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Podešavanje"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Spajanje..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Korisničko ime"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Odaberi lika"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Greška"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Lozinka"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Izmijeni"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Odjavi"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Pomoć --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-#, fuzzy
-msgid "Could not load map"
-msgstr "Neuspjelo priključivanje družini!"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Izlaz"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Neuspjelo priključivanje družini!"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Kupi"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Opis: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Učinak: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Izlaz"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Prodaj"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Poništi"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Promijeni Email Adresu"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Korisnički račun: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Korisničko ime mora biti dugo najmanje %d znakova."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Korisničko ime mora biti kraće od %d znakova."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Lozinka"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Lozinka mora biti duga najmanje %d znakova."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Lozinka mora biti kraća od %d znakova."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Boja kose:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Frizura:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Stvori"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Muško"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Žensko"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Greška"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Upravljanje Računom i Likovima"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "U redu"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Prethodni"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Slijedeći"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Ime: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Nivo: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Odjavi"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Novi"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Promijeni Email Adresu"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Odjavi"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Novac: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "Nivo poslaČ %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -601,182 +745,224 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Spajanje..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Oprema"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Skini opremu"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Ime: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Korisnički račun: %s"
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Efekti okruženja"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Oprema"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Skini opremu"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Zalihe"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Opremi"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Upotrijebi"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Ispusti"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Razdvoji"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Ispusti"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "U redu"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Odaberi količinu predmeta za razdvajanje."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Učinak: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Poslužitelj:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr ""
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Izmijeni"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "Karta"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Slijedeći"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Izlaz"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Slijedeći"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Skini opremu"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -792,329 +978,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Stanje"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Upotrijebi"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Vještine"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Razmijeni se s %s@@"
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Napad %+d"
 
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Šaptaj prema %s: %s"
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Razmijeni se s %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Napadni %s@@"
-
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "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:174
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@pickup|Uzmi %s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Opremi@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Upotrijebi@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Ispusti@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Razdvoji@@"
-
-#: src/gui/popupmenu.cpp:372
-#, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@use|Upotrijebi@@"
-
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Promijeni poslužitelj"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Promijeni lika"
 
@@ -1134,137 +1286,181 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Potvrdi:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "E-pošta:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Korisničko ime mora biti dugo najmanje %d znakova."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Korisničko ime mora biti kraće od %d znakova."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lozinka mora biti duga najmanje %d znakova."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lozinka mora biti kraća od %d znakova."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Poslužitelj:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Poslužitelj:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Spajanje..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Vlastiti kursor"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Odaberi poslužitelj"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Podešavanje"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Primjeni"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Ponovno pokreni prozore"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Glasnoća zvučnih efekata"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Glasnoća glazbe"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Primjeni"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Ponovno pokreni prozore"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za početak kalibracije"
@@ -1305,432 +1501,600 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Prodaj"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "isključeno"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "nisko"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "visoko"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Vidljiva imena"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Ograničenje sličica u sekundi"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Slika"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Prozirnost sučelja"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Ne"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Prebacivanje u pregled na čitavom ekranu"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Promjena OpenGL-a"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Vještine"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Vještine"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nivo: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nivo: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Da li ste sigurni da želite obrisati ovog lika?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Stvori Lika"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Neuspjelo stvaranje lika!"
+
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Cehovi"
+
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Nivo: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Novac: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Podaci lika su u redu"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Nivo: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Predloži razmjenu"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Daješ:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Daješ:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Izmijeni"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 #, fuzzy
 msgid "You don't have enough money."
 msgstr "Nemaš podsjetnika!"
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Ime: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Spajanje..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1782,1210 +2146,1440 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Javna obavijest:"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Javna obavijest od %s:"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
-msgstr ""
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "Šaptaj prema %s: %s"
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Stanje"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Cehovi"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Stanje"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Kratica"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Odaberi poslužitelj"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Izmijeni"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Oprema"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
+msgid "Social Window"
 msgstr "Ponovno pokreni prozore"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Oprema"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Potvrdi Brisanje Lika"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Snaga:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Okretnost:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalnost:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Inteligencija:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Spretnost:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Ime:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Snaga:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Okretnost:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalnost:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencija:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Spretnost:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Napad %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Neuspjelo stvaranje lika!"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Obrana %+d"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Napad %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Obrana %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Odjavi"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "Promijeni Lozinku"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Neuspjela razmjena!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Neuspjelo korištenje emotea!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Neuspjelo sjedanje!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Neuspjelo stvaranje lika!"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Neuspjelo priključivanje družini!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Neuspjelo vikanje!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Još nisi dosegao/la dovoljno visok nivo!"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "Nedovoljno zdravlja!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "Nedovoljno SP-a!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Nemaš podsjetnika!"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Ne možeš to učiniti sad!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Trebaš još jedan crveni dragulj!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Trebaš još jedan plavi dragulj!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Nosiš previše predmeta da bi učinio to!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "Ha? Što je to?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "Skok nije uspio..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Krađa nije uspjela..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Otrov nije uspio..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Daješ:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Potvrdi Brisanje Lika"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Podaci lika su u redu"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Podaci lika su u redu"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Potvrdi Brisanje Lika"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Odaberi količinu predmeta za razmjenu."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Snaga volje:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Snaga volje:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Snaga volje:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Neuspjelo stvaranje lika!"
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3006,20 +3600,51 @@ msgstr "Zdravlje %+d"
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Odaberi lika"
+#~ msgid "Description: %s"
+#~ msgstr "Opis: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Prethodni"
+
+#~ msgid "New"
+#~ msgstr "Novi"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Nivo poslaČ %d"
+
+#~ msgid "Ok"
+#~ msgstr "U redu"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Napadni %s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Otkaži@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Opremi@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Upotrijebi@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Ispusti@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Razdvoji@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@use|Upotrijebi@@"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Polumjer klizanja"
diff --git a/po/id.po b/po/id.po
index df3dde32..eb9d3653 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,577 +17,721 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Atur"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Menyambung..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Login"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Pilih Karakter"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Kesalahan"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Kata Sandi:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Ubah"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Tidak terdaftar"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Keluar"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:360
+msgid "Network Error"
+msgstr ""
+
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Deskripsi: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Efek: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Keluar"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Jual"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Panjang username setidak-tidaknya %d karakter"
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Panjang username setidak-tidaknya %d karakter"
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Warna Rambut:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Gaya Rambut:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Buat"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Kesalahan"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda sekurang-kurangnya harus 4 karakter"
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d point"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Sebelumnya"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Berikutnya"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Nama: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Tingkatan: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Tidak terdaftar"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Buat baru"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Ubah"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Tidak terdaftar"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Uang: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,182 +744,222 @@ msgstr "Ya"
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Menyambung..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Perlengkapan"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nama: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Perlengkapan"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Jatuh"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Pecah"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Jatuh"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang mau di buang"
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang mau di pisahkan"
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Efek: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr ""
-
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Mendaftar"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Ubah"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "MiniMap"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Berikutnya"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Keluar"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Berikutnya"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -791,329 +975,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Status"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Gunakan"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Keahlian"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Dagang Dengan %s@@"
 
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Serangan %+d"
 
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Ketekunan"
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Dagang Dengan %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Serang%s@@"
-
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: 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:165
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@pickup|Ambil %s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Melengkapi@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Gunakan@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Buang@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Pisah@@"
-
-#: src/gui/popupmenu.cpp:372
-#, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@use|Gunakan@@"
-
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Ganti Server"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Ganti Karakter"
 
@@ -1133,135 +1283,179 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Panjang username setidak-tidaknya %d karakter"
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Kata sandi tidak sama."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Menyambung..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Tolong tulis address dan port dari server"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Atur"
-
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Terapkan"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Suara"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Suara"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
+msgstr ""
+
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Terapkan"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1304,431 +1498,598 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Jual"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "mati"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "rendah"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "tinggi"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Batas FPS"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Tidak"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Mengganti ke layar penuh"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Mengubah OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Keahlian"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Tingkatan: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Tingkatan: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Buat Karakter"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Tingkatan: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Uang: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Stats Karakter OK"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Tingkatan: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Tambah"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Ubah"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nama: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Menyambung..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1780,1208 +2141,1435 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Status"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Tombol Singkat"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Ubah"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Perlengkapan"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Perlengkapan"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Stats Karakter OK"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Kekuatan"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nama:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Kekuatan"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Kecerdasan"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Ketangkasan"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Serangan %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Pertahanan %+d"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Serangan %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Pertahanan %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Tidak terdaftar"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Anda memberikan:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Stats Karakter OK"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Stats Karakter OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Stats Karakter OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Stats Karakter OK"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Pilih jumlah item yang mau di perdagangkan"
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Ketekunan"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Ketekunan"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Ketekunan"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3002,20 +3590,48 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Pilih Karakter"
+#~ msgid "Description: %s"
+#~ msgstr "Deskripsi: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Sebelumnya"
+
+#~ msgid "New"
+#~ msgstr "Buat baru"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Serang%s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Batal@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Melengkapi@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Gunakan@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Buang@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Pisah@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@use|Gunakan@@"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Radius gulungan"
diff --git a/po/it.po b/po/it.po
index b93967af..97699267 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@
 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-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-01-09 12:36+0000\n"
 "Last-Translator: Marco Castelluccio <markos30@hotmail.it>\n"
 "Language-Team: Italian\n"
@@ -19,577 +19,729 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Impostazioni"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "In attesa del server"
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Autenticazione"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Scelta Personaggio"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Errore"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+msgid "Password Change"
+msgstr ""
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Cambia"
+
+#: src/client.cpp:863
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "Membro promosso con successo."
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Cancella registrazione"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Aiuto --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Mostra questo aiuto"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Mostra il nome della mappa"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Mostra il numero degli utenti online"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Pulisci questa finestra"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Invia un messaggio privato a un utente"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias di msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Alias di msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Crea una scheda per i messaggi privati con un altro utente"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > Alias di query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Mostra tutti i canali pubblici"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Entra o crea un canale"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/party > Invita un utente in un party"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > Invita un utente in un party"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare sussurri vuoti!"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesa di entrare nel canale %s."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
-msgstr "Impossibile caricare la mappa"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
 
-#: src/engine.cpp:89
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
+msgstr ""
+
+#: src/commandhandler.h:31
 #, c-format
-msgid "Error while loading %s"
-msgstr "Errore durante il caricamento di %s"
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
 
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "Screenshot salvata in ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio screenshot fallito!"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr "Connessione al server persa. Prego, riavviare il gioco"
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "Errore di Rete"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Esci"
-
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "Sicuro di voler uscire?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr ""
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "Amico"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Impossibile caricare la mappa"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr "Errore durante il caricamento di %s"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "Lista Amici"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
+msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Compra"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prezzo: %s / Totale: %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
-msgstr "Massimo"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Descrizione : %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Effetto : %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Esci"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr "Massimo"
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Vendi"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Cambia indirizzo email"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
 msgstr "Inserisci il nuovo indirizzo email due volte:"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Il nome utente deve contenere almeno %d caratteri."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Il nome utente deve avere meno di %d caratteri."
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Nuovo indirizzo email già presente."
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr "Inserisci la nuova password due volte:"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "La password deve essere lunga almeno %d caratteri."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "La password deve contenere meno di %d caratteri."
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "Inserisci la nuova password due volte:"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Colore Capelli:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Stile Capelli:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Crea"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Maschio"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Femmina"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Prego distribuire %d punti"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Errore"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Prego rimuovere %d punti"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Conferma Eliminazione Personaggio"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler eliminare questo personaggio?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Gestione Account e Personaggio"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Precedente"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Prossimo"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Nome: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Livello: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Cancella registrazione"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Nuovo"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Cambia indirizzo email"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Cancella registrazione"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Monete: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "Livello Job: %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Chiudi"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "Soldi: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "Sono presenti %d giocatori."
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurrando a %s: %s"
@@ -602,182 +754,224 @@ msgstr "Si"
 msgid "No"
 msgstr "No"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Connessione..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Equipaggiamento"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Rimuovi"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
-msgstr "Gilda"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "Argomento: %s"
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
-msgstr "Crea Gilda"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
-msgstr "Invita Utente"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Soldi: %s"
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
-msgstr "Lascia Gilda"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Prezzo: %s / Totale: %s"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Suoni ambientali"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Equipaggiamento"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Rimuovi"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventario"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipaggia"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usa"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Lascia"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "Spazi:"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "Peso:"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Lascia"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "Tutti"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "Seleziona la quantità di oggetti da depositare."
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da recuperare."
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "Peso: "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Autenticazione"
 
-#: 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 "Porta:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr "Recente:"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Ricorda Username"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Cambia"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "Mappa"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "In attesa del server"
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Prossimo"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Esci"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "PNG"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Prossimo"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr "A:"
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "Invia"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Rimuovi"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "Testo"
 
@@ -793,329 +987,300 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "Sfondo"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+#, fuzzy
+msgid "Item Too Expensive"
 msgstr "Oggetto troppo caro"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+#, fuzzy
+msgid "Item Is Equipped"
 msgstr "Oggetto equipaggiato"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "Giocatore"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "Sussurro"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "E'"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gilda"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "Nomi Giocatori"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "Proprio Nome"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "Nomi GM"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "PNG"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "Mostri"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Stato"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Usa"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "Pantaloni"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "Scarpe"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Abilità"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "Anelli"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "Munizioni"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s ti ha invitato a entrare nel loro party."
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s ti ha invitato a entrare nel party %s."
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr "Accetta Invito Party"
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr "Invito di %s accettato."
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr "Invito di %s rifiutato."
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Aggiungi il name alla chat@@"
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Commercia con %s"
 
-#: 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:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Attacco %+d"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Attacca %s@@"
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Sussurro"
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "@@ignore|Ignore %s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
 msgstr "@@ignore|Ignora %s@@"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:118
+#, fuzzy, c-format
+msgid "Completely ignore %s"
 msgstr "@@ignore|Ignora completamente %s@@"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
 msgstr "@@guild|Invita %s a entrare nella tua gilda@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Invita %s a entrare nel tuo party@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Caccia giocatore@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:153
+#, fuzzy, c-format
+msgid "Talk to %s"
 msgstr "@@talk|Parla a %s@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+#, fuzzy
+msgid "Kick monster"
 msgstr "@@admin-kick|Caccia mostro@@"
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Annulla@@"
+#: src/gui/popupmenu.cpp:174
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|Aggiungi il name alla chat@@"
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@pickup|Raccogli %s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#, fuzzy
+msgid "Add to chat"
 msgstr "@@chat|Aggiungi alla chat@@"
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@use|Rimuovi@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Equipaggia@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@usa|Usa@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Lascia@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Lascia@@"
-
-#: src/gui/popupmenu.cpp:372
-#, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@usa|Usa@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|Recupera@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
+msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Cambia server"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Cambia personaggio"
 
@@ -1135,137 +1300,186 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Il nome utente deve contenere almeno %d caratteri."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Il nome utente deve avere meno di %d caratteri."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "La password deve essere lunga almeno %d caratteri."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "La password deve contenere meno di %d caratteri."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+#, fuzzy
+msgid "Choose Your Server"
 msgstr "Scegli il server"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Porta:"
+
+#: src/gui/serverdialog.cpp:143
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Connessione..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Cursore personalizzato"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Per favore inserisci l'indirizzo e la porta del server."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Scegli il server"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Impostazioni"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Applica"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "In attesa del server"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Resetta finestre"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Suono"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Volume musica"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "Colori"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+#, fuzzy
+msgid "Type:"
 msgstr "Tipo: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+#, fuzzy
+msgid "Red:"
 msgstr "Rosso: "
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
 msgstr "Verde: "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+#, fuzzy
+msgid "Blue:"
 msgstr "Blu: "
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Applica"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Resetta finestre"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
@@ -1306,431 +1520,606 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Vendi"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "Spento"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "Basso"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "Alto"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Limita FPS:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Opacità IU"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "No"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Modalità a schermo intero"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Modifica OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Abilità"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Abilità"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Livello: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Livello: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gilda creata."
+
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
-msgstr ""
+#: src/gui/socialwindow.cpp:146
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "Crea Gilda"
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Sicuro di voler uscire?"
+
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Invita un utente in un party"
+
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Invita un utente in un party"
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Sicuro di voler uscire?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "Crea Gilda"
+
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Crea Personaggio"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "Invita Utente"
+
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Invito di %s accettato."
+
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Invito di %s rifiutato."
+
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Invito di %s accettato."
+
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Invito di %s rifiutato."
+
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Errore nella creazione della gilda."
+
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Gilda"
+
+#: src/gui/socialwindow.cpp:485
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "Scegli il server"
+
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s ti ha invitato a entrare nel party %s."
+
+#: src/gui/socialwindow.cpp:507
+#, fuzzy
+msgid "Accept Guild Invite"
+msgstr "Accetta Invito Party"
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s ti ha invitato a entrare nel loro party."
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s ti ha invitato a entrare nel party %s."
+
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s ti ha invitato a entrare nel loro party."
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s ti ha invitato a entrare nel party %s."
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr "Accetta Invito Party"
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Scegli il server"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Livello: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "Soldi: %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
 msgstr ""
 
-#: src/gui/status.cpp:221
-#, c-format
-msgid "Remaining Status Points: %d"
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Monete: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Statistiche personaggio OK"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Livello: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Inizia uno scambio"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Dai:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Dai:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Cambia"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Connessione..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1782,1209 +2171,1479 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
-msgstr ""
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "Sussurrando a %s: %s"
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Stato"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Stato"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Scorciatoia"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Scegli il server"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Cambia"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Scegli il server"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
-msgstr ""
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
+msgstr "Mostri"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Equipaggiamento"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
+msgid "Social Window"
 msgstr "Resetta finestre"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Equipaggiamento"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Hai preso "
+msgstr[1] "Hai preso "
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr ""
-
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
-msgstr ""
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "/help > Mostra questo aiuto"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
-msgstr ""
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
+msgstr "Impossibile inviare sussurri vuoti!"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Statistiche personaggio OK"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Forza:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agilità:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalità:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Giocatore"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nome:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Forza:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agilità:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitalità:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenza:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Destrezza:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Attacco %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
+msgstr "Nessun gameserver disponibile."
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+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:140
+#, fuzzy
+msgid "This account is already logged in."
+msgstr "Login già effettuato"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Difesa %+d"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Attacco %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Difesa %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/party > Invita un utente in un party"
+
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
+msgstr "Nuova password non corretta"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:85
+#, fuzzy
+msgid "New password too short."
+msgstr "Nuova password non corretta"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "Comando sconosciuto."
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Cancella registrazione"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "Username o password non corretti"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Invito di %s rifiutato."
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "Username già presente"
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "Sei morto."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
-msgstr "Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia. Ora dormi sepolto in un campo di grano, non è la rosa non è il tulipano che ti fan veglia dall'ombra dei fossi, ma sono mille papaveri rossi."
+msgstr ""
+"Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia. "
+"Ora dormi sepolto in un campo di grano, non è la rosa non è il tulipano che "
+"ti fan veglia dall'ombra dei fossi, ma sono mille papaveri rossi."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "Non sei più cosi vivo."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Le fredde mani della morte nera si stanno aggrappando alla tua squallida anima."
+msgstr ""
+"Le fredde mani della morte nera si stanno aggrappando alla tua squallida "
+"anima."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
-msgstr "No, piccolo. Il tuo personaggio non è veramente morto. Lui... ehm... è andato in un posto migliore."
+msgstr ""
+"No, piccolo. Il tuo personaggio non è veramente morto. Lui... ehm... è "
+"andato in un posto migliore."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
-msgstr "Il tuo piano di rompere le armi nemiche colpendole con la tua gola è fallito."
+msgstr ""
+"Il tuo piano di rompere le armi nemiche colpendole con la tua gola è fallito."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "Sembra proprio che non ha funzionato tanto bene."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "Vuoi che i tuoi beni vengano identificati?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristemente, nessuna traccia di te è stata mai ritrovata..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "Annichilato."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "Sembra che almeno la tua testa ti sia stata restituita."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Sei stato accartocciato di nuovo, scarica il tuo corpo nelle fogne e cercatene un altro."
+msgstr ""
+"Sei stato accartocciato di nuovo, scarica il tuo corpo nelle fogne e "
+"cercatene un altro."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "Ma quando mai! Non sei mica morto! Stai solo riposando..."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "Non sei più."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "Hai cessato di esistere."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
-msgstr "Il Clostridium botulinum ti ha infettato (in parole povere per te che sei ignorante, sei scaduto) e sei andato a trovare il tuo artefice metafisico."
+msgstr ""
+"Il Clostridium botulinum ti ha infettato (in parole povere per te che sei "
+"ignorante, sei scaduto) e sei andato a trovare il tuo artefice metafisico."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "Ci dispiace molto, ma sei appena diventato un cadavere."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "Privo di vita, requiescas in pace."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Se non fossi così animato, staresti raccogliendo le margheritine."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "I tuoi processi metabolici ora sono storia."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "Sei crepato. Malamente."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "Sei un ex-giocatore."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
-msgstr "Stai portando più della metà del tuo peso. Non puoi riacquistare salute."
+msgstr ""
+"Stai portando più della metà del tuo peso. Non puoi riacquistare salute."
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "Hai preso "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr "Equipaggia prima delle freccie."
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Scambio fallito!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Non puoi gridare!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai raggiunto un livello abbastanza alto!"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "Scambio annullato."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "Scambio completato."
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
 msgstr "Sei morto"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "Login già effettuato"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Username già presente"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Statistiche personaggio OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Statistiche personaggio OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Statistiche personaggio OK"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Seleziona la quantità di oggetti da scambiare."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Comando sconosciuto."
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "Nessun gameserver disponibile."
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Volontà:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr "Argomento: %s"
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+#, fuzzy
+msgid "Listing channels."
+msgstr "Richiesa di entrare nel canale %s."
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s è entrato nel party."
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Comando sconosciuto."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Volontà:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Volontà:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "Gilda creata."
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr "Errore nella creazione della gilda."
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr "Invito inviato."
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr "Membro promosso con successo."
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr "Impossibile promuovere membro."
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "Login già effettuato"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "Il server è pieno"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "Nuova password non corretta"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "Account non connesso. Per favore, effettuare prima il login"
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "Nuovo indirizzo email non corretto"
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "Vecchio indirizzo email non corretto"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "Nuovo indirizzo email già presente."
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "Versione del client troppo vecchia"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "Username o password non corretti"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "Username, passowrd o indirizzo email non corretti"
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "Username già presente"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "Indirizzo email già presente"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr "Entrato nel party."
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr "%s è entrato nel party."
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "Invito di %s rifiutato."
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr "Commercia con %s"
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Ignora completamente %s@@"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3005,20 +3664,78 @@ msgstr "PF %+d"
 msgid "MP %+d"
 msgstr "PM %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Scelta Personaggio"
+#~ msgid "Buddy"
+#~ msgstr "Amico"
+
+#~ msgid "Buddy List"
+#~ msgstr "Lista Amici"
+
+#~ msgid "Description: %s"
+#~ msgstr "Descrizione : %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Effetto : %s"
+
+#~ msgid "Previous"
+#~ msgstr "Precedente"
+
+#~ msgid "New"
+#~ msgstr "Nuovo"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Livello Job: %d"
+
+#~ msgid "Quit Guild"
+#~ msgstr "Lascia Gilda"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Recent:"
+#~ msgstr "Recente:"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Scambia con %s@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attacca %s@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Caccia giocatore@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annulla@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Rimuovi@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equipaggia@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@usa|Usa@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Lascia@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Lascia@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@usa|Usa@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Recupera@@"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Raggio dello scroll"
diff --git a/po/ja.po b/po/ja.po
index 70320769..1a37217a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,577 +17,719 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "セットアップ"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "接続しています..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "ログイン"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "キャラを選択"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "エラー"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "パスワード:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+msgid "Email Change"
+msgstr ""
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "登録削除"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "終了"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "買う"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "名状: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "終了"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "キャラを作成"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名前:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "髪の色："
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "髪型："
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "作成"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, 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:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "エラー"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラは消してもいいですか?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "前へ"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "次へ"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "名前: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "レベル: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "登録削除"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "新規"
+#: src/gui/charselectdialog.cpp:150
+msgid "Change Email"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "削除"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "登録削除"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "GP: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,181 +742,220 @@ msgstr "はい"
 msgid "No"
 msgstr "いいえ"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "接続しています..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "名前: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "使う"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "分割"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "了解"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr ""
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "効用: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "サーバ:"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "次へ"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "終了"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "次へ"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -790,328 +971,294 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "状態"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "使う"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
+#: src/gui/popupmenu.cpp:84
 #, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
+msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "@@attack|%sを攻撃する@@"
 
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "精神:"
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "@@trade|Trade With %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|%sを攻撃する@@"
-
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|使う@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:372
-#, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@use|使う@@"
-
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
@@ -1131,135 +1278,179 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Eメール："
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "パスワードが一致していません。"
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "サーバ:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "ポート:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "サーバ:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "接続しています..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "サーバ:"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "セットアップ"
-
-#: src/gui/setup.cpp:73
-msgid "Apply"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "音声"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1302,430 +1493,594 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "いいえ"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, c-format
+msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "レベル: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "レベル: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Job: %d"
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "このキャラは消してもいいですか?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "このキャラは消してもいいですか?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "キャラを作成"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:502
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/trade.cpp:51
-msgid "Propose trade"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "レベル: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "GP: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "レベル: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
 #: src/gui/trade.cpp:52
-msgid "Confirmed. Waiting..."
+msgid "Propose trade"
 msgstr ""
 
 #: src/gui/trade.cpp:53
-msgid "Agree trade"
+msgid "Confirmed. Waiting..."
 msgstr ""
 
 #: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "名前: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "接続しています..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1777,1206 +2132,1423 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:55
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/windowmenu.cpp:61
+msgid "Shortcut"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
-msgid "Shortcut"
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "筋力:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "素早さ:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "体力:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "知性:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "敏捷:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "名前:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "筋力:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "素早さ:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "体力:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "知性:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "敏捷:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "削除"
+
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "登録削除"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:199
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "精神:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "精神:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "精神:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2997,17 +3569,30 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "キャラを選択"
+#~ msgid "Description: %s"
+#~ msgstr "名状: %s"
+
+#~ msgid "Previous"
+#~ msgstr "前へ"
+
+#~ msgid "New"
+#~ msgstr "新規"
+
+#~ msgid "Ok"
+#~ msgstr "了解"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|使う@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@use|使う@@"
diff --git a/po/mana.pot b/po/mana.pot
index 9d3fc597..4bc9c95a 100644
--- a/po/mana.pot
+++ b/po/mana.pot
@@ -1,557 +1,451 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Mana Development Team
+# Copyright (C) YEAR The Mana Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/commandhandler.cpp:149 src/commandhandler.cpp:319
-#: src/commandhandler.cpp:320 src/commandhandler.cpp:344
-#: src/commandhandler.cpp:397 src/engine.cpp:50 src/engine.cpp:57
-#: src/engine.cpp:106 src/engine.cpp:107 src/game.cpp:141 src/game.cpp:389
-#: src/game.cpp:390 src/gui/buy.cpp:68 src/gui/buy.cpp:79 src/gui/buy.cpp:80
-#: src/gui/buy.cpp:247 src/gui/buy.cpp:248 src/gui/charcreatedialog.cpp:67
-#: src/gui/chat.cpp:197 src/gui/chat.cpp:279 src/gui/chat.cpp:307
-#: src/gui/chat.cpp:309 src/gui/chat.cpp:380 src/gui/chat.cpp:384
-#: src/gui/chat.cpp:386 src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:66
-#: src/gui/debugwindow.cpp:67 src/gui/itemamount.cpp:69
-#: src/gui/npcdialog.cpp:85 src/gui/npcdialog.cpp:93 src/gui/npcdialog.cpp:172
-#: src/gui/npcpostdialog.cpp:105 src/gui/npcpostdialog.cpp:106
-#: src/gui/outfitwindow.cpp:129 src/gui/palette.cpp:217
-#: src/gui/partywindow.cpp:176 src/gui/partywindow.cpp:211
-#: src/gui/partywindow.cpp:218 src/gui/recorder.cpp:119
-#: src/gui/register.cpp:212 src/gui/register.cpp:213 src/gui/sell.cpp:70
-#: src/gui/sell.cpp:77 src/gui/sell.cpp:78 src/gui/sell.cpp:266
-#: src/gui/sell.cpp:267 src/gui/serverdialog.cpp:101
-#: src/gui/serverdialog.cpp:107 src/gui/serverdialog.cpp:219
-#: src/gui/setup_colors.cpp:177 src/gui/setup_players.cpp:81
-#: src/gui/setup_video.cpp:146 src/gui/setup_video.cpp:160
-#: src/gui/setup_video.cpp:175 src/gui/setup_video.cpp:209
-#: src/gui/setup_video.cpp:216 src/gui/setup_video.cpp:219
-#: src/gui/setup_video.cpp:573 src/gui/skilldialog.cpp:107
-#: src/gui/skilldialog.cpp:205 src/gui/specialswindow.cpp:104
-#: src/gui/specialswindow.cpp:191 src/gui/statuswindow.cpp:100
-#: src/gui/statuswindow.cpp:263 src/gui/trade.cpp:79 src/gui/trade.cpp:100
-#: src/gui/trade.cpp:182 src/gui/trade.cpp:236 src/gui/trade.cpp:244
-#: src/gui/updatewindow.cpp:70 src/gui/updatewindow.cpp:71
-#: src/gui/updatewindow.cpp:73 src/gui/updatewindow.cpp:107
-#: src/gui/updatewindow.cpp:398 src/gui/widgets/channeltab.cpp:116
-#: src/gui/widgets/channeltab.cpp:123 src/gui/widgets/chattab.cpp:80
-#: src/gui/widgets/chattab.cpp:141 src/gui/widgets/chattab.cpp:146
-#: src/gui/widgets/chattab.cpp:153 src/gui/widgets/chattab.cpp:161
-#: src/gui/widgets/chattab.cpp:171 src/gui/widgets/chattab.cpp:173
-#: src/main.cpp:675 src/main.cpp:698 src/main.cpp:795 src/main.cpp:1064
-#: src/main.cpp:1159 src/net/ea/chathandler.cpp:122
-#: src/net/ea/partyhandler.cpp:143 src/net/ea/partyhandler.cpp:146
-#: src/net/ea/partyhandler.cpp:320 src/net/manaserv/charhandler.cpp:114
-#: src/net/manaserv/charhandler.cpp:192 src/net/manaserv/chathandler.cpp:188
-#: src/net/manaserv/chathandler.cpp:211 src/net/manaserv/chathandler.cpp:266
-#: src/net/manaserv/chathandler.cpp:340 src/net/manaserv/generalhandler.cpp:67
-#: src/net/manaserv/guildhandler.cpp:131 src/playerrelations.cpp:62
-#: src/playerrelations.cpp:283 src/resources/itemdb.cpp:114
-#: src/resources/itemdb.cpp:147 src/resources/itemdb.cpp:148
-#: src/resources/itemdb.cpp:149 src/resources/itemdb.cpp:150
-#: src/resources/itemdb.cpp:180 src/resources/itemdb.cpp:191
-#: src/resources/itemdb.cpp:228 src/resources/itemdb.cpp:229
-#: src/resources/itemdb.cpp:230 src/resources/itemdb.cpp:306
-#: src/resources/monsterdb.cpp:101 src/resources/monsterdb.cpp:133
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-31 15:55+0100\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/commandhandler.cpp:52 src/commandhandler.cpp:184
-#: src/commandhandler.cpp:191 src/gui/widgets/channeltab.cpp:59
-#: src/gui/widgets/whispertab.cpp:77 src/main.cpp:557
-#: src/net/ea/gui/partytab.cpp:67
-msgid "help"
-msgstr ""
-
-#: src/commandhandler.cpp:60 src/commandhandler.cpp:195
-msgid "announce"
-msgstr ""
-
-#: src/commandhandler.cpp:64 src/commandhandler.cpp:284
-msgid "where"
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
 msgstr ""
 
-#: src/commandhandler.cpp:68 src/commandhandler.cpp:289
-msgid "who"
+#: src/client.cpp:623
+msgid "Connecting to server"
 msgstr ""
 
-#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
-msgid "msg"
+#: src/client.cpp:650
+msgid "Logging in"
 msgstr ""
 
-#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
-#: src/gui/popupmenu.cpp:227
-msgid "whisper"
+#: src/client.cpp:683
+msgid "Entering game world"
 msgstr ""
 
-#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
-msgid "w"
+#: src/client.cpp:739
+msgid "Requesting characters"
 msgstr ""
 
-#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
-msgid "query"
+#: src/client.cpp:768
+msgid "Connecting to the game server"
 msgstr ""
 
-#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
-msgid "q"
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
 msgstr ""
 
-#: src/commandhandler.cpp:80 src/commandhandler.cpp:207
-#: src/gui/popupmenu.cpp:238 src/gui/widgets/whispertab.cpp:84
-#: src/gui/widgets/whispertab.cpp:103
-msgid "ignore"
+#: src/client.cpp:815
+msgid "Requesting registration details"
 msgstr ""
 
-#: src/commandhandler.cpp:84 src/commandhandler.cpp:278
-#: src/gui/popupmenu.cpp:231 src/gui/widgets/whispertab.cpp:90
-#: src/gui/widgets/whispertab.cpp:107
-msgid "unignore"
+#: src/client.cpp:842
+msgid "Password Change"
 msgstr ""
 
-#: src/commandhandler.cpp:88 src/commandhandler.cpp:213
-msgid "join"
+#: src/client.cpp:843
+msgid "Password changed successfully!"
 msgstr ""
 
-#: src/commandhandler.cpp:92 src/commandhandler.cpp:219
-msgid "list"
+#: src/client.cpp:862
+msgid "Email Change"
 msgstr ""
 
-#: src/commandhandler.cpp:96 src/commandhandler.cpp:202
-msgid "clear"
+#: src/client.cpp:863
+msgid "Email changed successfully!"
 msgstr ""
 
-#: src/commandhandler.cpp:100 src/commandhandler.cpp:245
-#: src/gui/popupmenu.cpp:327
-msgid "party"
+#: src/client.cpp:883
+msgid "Unregister Successful"
 msgstr ""
 
-#: src/commandhandler.cpp:104 src/commandhandler.cpp:224
-msgid "me"
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/commandhandler.cpp:108 src/commandhandler.cpp:259
-msgid "record"
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:112 src/commandhandler.cpp:267
-#: src/commandhandler.cpp:435
-msgid "toggle"
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:116 src/commandhandler.cpp:252
-msgid "present"
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:122 src/commandhandler.cpp:297
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:130 src/gui/chat.cpp:110
-#: src/gui/statuswindow.cpp:442
-msgid "1"
-msgstr ""
-
-#: src/commandhandler.cpp:131
-msgid "y"
-msgstr ""
-
-#: src/commandhandler.cpp:131
-msgid "Y"
-msgstr ""
-
-#: src/commandhandler.cpp:132
-msgid "t"
-msgstr ""
-
-#: src/commandhandler.cpp:132
-msgid "T"
-msgstr ""
-
-#: src/commandhandler.cpp:134 src/gui/chat.cpp:110 src/gui/chat.cpp:307
-#: src/gui/chat.cpp:309 src/gui/skilldialog.cpp:95
-#: src/gui/widgets/chattab.cpp:171 src/gui/widgets/chattab.cpp:173
-msgid "0"
-msgstr ""
-
-#: src/commandhandler.cpp:135
-msgid "n"
-msgstr ""
-
-#: src/commandhandler.cpp:135
-msgid "N"
-msgstr ""
-
-#: src/commandhandler.cpp:136
-msgid "f"
-msgstr ""
-
-#: src/commandhandler.cpp:136
-msgid "F"
-msgstr ""
-
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:156
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:171
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: src/commandhandler.cpp:172
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:178
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:188
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:189
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:215
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:210
+#: src/commandhandler.cpp:216
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:217
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:221
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:226
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:227
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:231
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:233
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:234
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:235 src/commandhandler.cpp:249
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
 #: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/partytab.cpp:79
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:240
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:241
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:242
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:248 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: src/commandhandler.cpp:266
 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:261
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:264
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:265
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:269
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:270
+#: src/commandhandler.cpp:281
 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:272
+#: src/commandhandler.cpp:283
 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:275
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:276
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:280 src/gui/widgets/whispertab.cpp:92
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: src/commandhandler.cpp:292
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:286
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:287
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:291
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:298
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:305
-msgid ", coordinates: "
-msgstr ""
-
-#: src/commandhandler.cpp:306 src/gui/chat.cpp:289
-msgid ", "
-msgstr ""
-
-#: src/commandhandler.cpp:322 src/net/ea/network.cpp:343
-msgid "\""
-msgstr ""
-
-#: src/commandhandler.cpp:334 src/gui/chat.cpp:405
-#: src/gui/outfitwindow.cpp:125 src/gui/widgets/chattab.cpp:115
-#: src/gui/widgets/chattab.cpp:122 src/gui/widgets/chattab.cpp:136
-#: src/net/ea/specialhandler.cpp:166 src/net/manaserv/beinghandler.cpp:288
-msgid " "
-msgstr ""
-
-#: src/commandhandler.cpp:364
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:372
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:386
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:400 src/commandhandler.cpp:448
-#: src/commandhandler.cpp:470
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:418
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:418
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:427
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:431
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:454
+#: src/commandhandler.cpp:477
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:461
+#: src/commandhandler.cpp:484
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:463
+#: src/commandhandler.cpp:486
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:478
+#: src/commandhandler.cpp:501
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:483
+#: src/commandhandler.cpp:506
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:508
 msgid "Player could not be unignored!"
 msgstr ""
 
@@ -560,240 +454,98 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/engine.cpp:80
-msgid "maps/"
-msgstr ""
-
-#: src/engine.cpp:80
-msgid ".tmx"
-msgstr ""
-
-#: src/engine.cpp:83
-msgid ".gz"
-msgstr ""
-
-#: src/engine.cpp:90 src/engine.cpp:92
-#, c-format
-msgid "Error while loading %s"
-msgstr ""
-
-#: src/engine.cpp:91
-msgid "Could Not Load Map"
-msgstr ""
-
-#: src/game.cpp:233
-msgid "ItemShortcut"
-msgstr ""
-
-#: src/game.cpp:235
-msgid "EmoteShortcut"
-msgstr ""
-
-#: src/game.cpp:240
+#: src/game.cpp:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:242
-msgid "logToChat"
-msgstr ""
-
-#: src/game.cpp:305 src/net/ea/playerhandler.cpp:195
-msgid "."
-msgstr ""
-
-#: src/game.cpp:324 src/game.cpp:325 src/game.cpp:421
-#: src/gui/setup_video.cpp:188 src/gui/setup_video.cpp:401 src/main.cpp:325
-msgid "fpslimit"
-msgstr ""
-
-#: src/game.cpp:365
-msgid "Desktop"
-msgstr ""
-
-#: src/game.cpp:391 src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:390
-#: src/gui/statuswindow.cpp:418 src/gui/updatewindow.cpp:330
-#: src/gui/updatewindow.cpp:341 src/gui/updatewindow.cpp:345
-#: src/gui/updatewindow.cpp:367 src/gui/updatewindow.cpp:392
-#: src/gui/updatewindow.cpp:427 src/gui/updatewindow.cpp:442
-#: src/gui/updatewindow.cpp:472 src/main.cpp:236 src/main.cpp:238
-#: src/main.cpp:242 src/main.cpp:247 src/main.cpp:1012
-msgid "/"
-msgstr ""
-
-#: src/game.cpp:392
-msgid "Mana_Screenshot_"
-msgstr ""
-
-#: src/game.cpp:392
-msgid ".png"
-msgstr ""
-
-#: src/game.cpp:405
+#: src/game.cpp:326
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:410
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:411
-msgid "Error: could not save screenshot."
-msgstr ""
-
-#: src/game.cpp:486
+#: src/game.cpp:355
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:534 src/game.cpp:896
-#, c-format
-msgid "Warning: guichan input exception: %s"
-msgstr ""
-
-#: src/game.cpp:564 src/gui/changeemaildialog.cpp:55
-#: src/gui/changeemaildialog.cpp:105 src/gui/changepassworddialog.cpp:58
-#: src/gui/changepassworddialog.cpp:86 src/gui/charcreatedialog.cpp:80
-#: src/gui/charcreatedialog.cpp:182 src/gui/itemamount.cpp:101
-#: src/gui/itemamount.cpp:181 src/gui/npcpostdialog.cpp:54
-#: src/gui/npcpostdialog.cpp:96 src/gui/popupmenu.cpp:347
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/register.cpp:145
-#: src/gui/trade.cpp:287 src/gui/unregisterdialog.cpp:56
-#: src/gui/unregisterdialog.cpp:86 src/gui/unregisterdialog.cpp:97
-#: src/gui/updatewindow.cpp:144 src/gui/updatewindow.cpp:210
-msgid "cancel"
+#: src/game.cpp:705
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:567 src/gui/itemamount.cpp:100 src/gui/itemamount.cpp:201
-#: src/gui/npcdialog.cpp:93 src/gui/npcdialog.cpp:154 src/gui/okdialog.cpp:42
-#: src/gui/okdialog.cpp:80 src/gui/quitdialog.cpp:46
-#: src/gui/quitdialog.cpp:105 src/gui/register.cpp:53
-#: src/gui/serverdialog.cpp:186 src/gui/trade.cpp:232 src/gui/trade.cpp:295
-#: src/main.cpp:984
-msgid "ok"
+#: src/game.cpp:712
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:707
-msgid "index"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:853
-msgid "Ignoring incoming trade requests"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/game.cpp:860
-msgid "Accepting incoming trade requests"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:47 src/gui/buy.cpp:50 src/gui/buy.cpp:76
-#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:86
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:260 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:279
-#, c-format
-msgid "%d / %d"
-msgstr ""
-
-#: src/gui/buy.cpp:67 src/gui/buy.cpp:262 src/gui/sell.cpp:69
-#: src/gui/sell.cpp:280
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:96
-#: src/gui/sell.cpp:72 src/gui/skilldialog.cpp:241
-#: src/gui/statuswindow.cpp:479
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
 msgid "+"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/buy.cpp:169 src/gui/itemamount.cpp:99
-#: src/gui/itemamount.cpp:185 src/gui/npcdialog.cpp:96
-#: src/gui/npcdialog.cpp:213 src/gui/sell.cpp:72 src/gui/sell.cpp:164
-#: src/gui/skilldialog.cpp:112 src/gui/skilldialog.cpp:241
-#: src/gui/statuswindow.cpp:479
-msgid "inc"
-msgstr ""
-
-#: src/gui/buy.cpp:75 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:97
-#: src/gui/sell.cpp:73 src/gui/statuswindow.cpp:491
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:75 src/gui/buy.cpp:175 src/gui/itemamount.cpp:98
-#: src/gui/itemamount.cpp:189 src/gui/npcdialog.cpp:97
-#: src/gui/npcdialog.cpp:217 src/gui/sell.cpp:73 src/gui/sell.cpp:170
-#: src/gui/statuswindow.cpp:491
-msgid "dec"
-msgstr ""
-
-#: src/gui/buy.cpp:76 src/gui/buy.cpp:190
-msgid "buy"
-msgstr ""
-
-#: src/gui/buy.cpp:77 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:75 src/gui/serverdialog.cpp:127
-#: src/keyboardconfig.cpp:102
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:77 src/gui/buy.cpp:149 src/gui/sell.cpp:75
-#: src/gui/sell.cpp:144 src/gui/serverdialog.cpp:127
-#: src/gui/serverdialog.cpp:244 src/gui/widgets/channeltab.cpp:71
-#: src/gui/widgets/channeltab.cpp:109
-msgid "quit"
-msgstr ""
-
-#: src/gui/buy.cpp:78 src/gui/sell.cpp:76 src/gui/statuswindow.cpp:408
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
 #: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
 msgid "Max"
 msgstr ""
 
-#: src/gui/buy.cpp:78 src/gui/buy.cpp:181 src/gui/sell.cpp:76
-#: src/gui/sell.cpp:176 src/gui/setup_video.cpp:173
-msgid "max"
-msgstr ""
-
-#: src/gui/buy.cpp:79 src/gui/buy.cpp:229 src/gui/buy.cpp:247
-#: src/gui/sell.cpp:77 src/gui/sell.cpp:252 src/gui/sell.cpp:266
-#, c-format
-msgid "Description: %s"
-msgstr ""
-
-#: src/gui/buy.cpp:80 src/gui/buy.cpp:231 src/gui/buy.cpp:248
-#: src/gui/sell.cpp:78 src/gui/sell.cpp:254 src/gui/sell.cpp:267
-#, c-format
-msgid "Effect: %s"
-msgstr ""
-
-#: src/gui/buy.cpp:90 src/gui/buy.cpp:164 src/gui/sell.cpp:90
-#: src/gui/sell.cpp:159
-msgid "slider"
-msgstr ""
-
-#: src/gui/buysell.cpp:35
-msgid "Shop"
-msgstr ""
-
 #: src/gui/buysell.cpp:38
-msgid "BuySell"
+msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:90 src/gui/sell.cpp:47
-#: src/gui/sell.cpp:50 src/gui/sell.cpp:74
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:94
-#: src/gui/changeemaildialog.cpp:55 src/gui/changepassworddialog.cpp:58
-#: src/gui/charcreatedialog.cpp:80 src/gui/connectiondialog.cpp:38
-#: src/gui/itemamount.cpp:101 src/gui/npcpostdialog.cpp:54
-#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:196
-#: src/gui/popupmenu.cpp:400 src/gui/quitdialog.cpp:47 src/gui/register.cpp:74
-#: src/gui/setup.cpp:51 src/gui/setup.cpp:106 src/gui/textdialog.cpp:37
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
 #: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
@@ -811,17 +563,6 @@ msgstr ""
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:54 src/gui/changeemaildialog.cpp:94
-#: src/gui/changeemaildialog.cpp:95 src/gui/changeemaildialog.cpp:109
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:213
-msgid "change_email"
-msgstr ""
-
-#: src/gui/changeemaildialog.cpp:115
-#, c-format
-msgid "ChangeEmailDialog::Email change, Username is %s"
-msgstr ""
-
 #: src/gui/changeemaildialog.cpp:127
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
@@ -836,27 +577,11 @@ msgstr ""
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:196 src/gui/unregisterdialog.cpp:134
-#: src/main.cpp:1110 src/main.cpp:1117 src/main.cpp:1252
-#: src/net/ea/charserverhandler.cpp:129 src/net/ea/charserverhandler.cpp:148
-#: src/net/manaserv/charhandler.cpp:127 src/net/manaserv/charhandler.cpp:229
-msgid "Error"
-msgstr ""
-
 #: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
 #: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:56 src/gui/changepassworddialog.cpp:74
-#: src/gui/changepassworddialog.cpp:75 src/gui/changepassworddialog.cpp:76
-#: src/gui/changepassworddialog.cpp:90 src/gui/charselectdialog.cpp:128
-#: src/gui/charselectdialog.cpp:209
-msgid "change_password"
-msgstr ""
-
 #: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
 #: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
@@ -866,11 +591,6 @@ msgstr ""
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:97
-#, c-format
-msgid "ChangePasswordDialog::Password change, Username is %s"
-msgstr ""
-
 #: src/gui/changepassworddialog.cpp:110
 msgid "Enter the old password first."
 msgstr ""
@@ -889,74 +609,51 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:68 src/gui/login.cpp:52
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
 #: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:71 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:71 src/gui/charcreatedialog.cpp:184
-msgid "nextcolor"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:77
-#: src/gui/outfitwindow.cpp:65
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:189
-msgid "prevcolor"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:75
+#: src/gui/charcreatedialog.cpp:74
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:194
-msgid "nextstyle"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:77 src/gui/charcreatedialog.cpp:199
-msgid "prevstyle"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:78
+#: src/gui/charcreatedialog.cpp:77
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:79 src/gui/charselectdialog.cpp:364
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:97
-#: src/gui/charcreatedialog.cpp:158 src/net/ea/gui/partytab.cpp:69
-#: src/net/ea/gui/partytab.cpp:110
-msgid "create"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:87 src/gui/charcreatedialog.cpp:88
-#: src/gui/charcreatedialog.cpp:207 src/resources/itemdb.cpp:291
-msgid "gender"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:82 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:100 src/gui/charcreatedialog.cpp:245
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -965,35 +662,24 @@ msgstr ""
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:204 src/gui/charcreatedialog.cpp:303
-msgid "statslider"
-msgstr ""
-
-#: src/gui/charcreatedialog.cpp:237
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:249
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:67
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:68
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:76 src/gui/confirmdialog.cpp:42
-#: src/gui/confirmdialog.cpp:90 src/gui/guildwindow.cpp:171
-#: src/gui/partywindow.cpp:206 src/gui/updatewindow.cpp:74
-#: src/net/ea/tradehandler.cpp:53 src/net/manaserv/tradehandler.cpp:60
-msgid "yes"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:119
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
@@ -1001,136 +687,46 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127 src/gui/charselectdialog.cpp:187
-msgid "switch"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:146 src/gui/unregisterdialog.cpp:47
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
 #: src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:147 src/gui/charselectdialog.cpp:217
-#: src/gui/unregisterdialog.cpp:55 src/gui/unregisterdialog.cpp:101
-msgid "unregister"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:154
+#: src/gui/charselectdialog.cpp:150
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:183 src/gui/charselectdialog.cpp:355
-#: src/gui/inventorywindow.cpp:81 src/gui/inventorywindow.cpp:178
-#: src/gui/popupmenu.cpp:282 src/gui/specialswindow.cpp:109
-#: src/gui/specialswindow.cpp:213
-msgid "use"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:192 src/gui/charselectdialog.cpp:365
-#: src/net/ea/gui/partytab.cpp:69 src/net/ea/gui/partytab.cpp:110
-msgid "new"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:202 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:213
-msgid "delete"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:305 src/gui/charselectdialog.cpp:308
-msgid "wwwwwwwww"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:305
-msgid "go"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:306
-msgid "wwwwwwwwwwwwwwwwwwwwwwww"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:307
-msgid "(888)"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:310 src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:354
+#: src/gui/charselectdialog.cpp:387
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:356
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:357
-#, c-format
-msgid "Level %d"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:366 src/gui/charselectdialog.cpp:367
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:75 src/gui/chat.cpp:79 src/gui/palette.cpp:96
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:96 src/gui/chat.cpp:179
-msgid "chatinput"
-msgstr ""
-
-#: src/gui/chat.cpp:110 src/gui/chat.cpp:117
-msgid "ReturnToggles"
-msgstr ""
-
-#: src/gui/chat.cpp:296
+#: src/gui/chat.cpp:287
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:307 src/gui/chat.cpp:416 src/gui/widgets/chattab.cpp:171
-msgid "["
-msgstr ""
-
-#: src/gui/chat.cpp:309 src/gui/serverdialog.cpp:70
-#: src/gui/serverdialog.cpp:78 src/gui/widgets/chattab.cpp:173
-#: src/net/manaserv/chathandler.cpp:307 src/net/manaserv/chathandler.cpp:308
-#: src/net/manaserv/chathandler.cpp:319
-msgid ":"
-msgstr ""
-
-#: src/gui/chat.cpp:311 src/gui/widgets/chattab.cpp:175
-msgid "] "
-msgstr ""
-
-#: src/gui/chat.cpp:314
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:416
-msgid "]"
-msgstr ""
-
-#: src/gui/chat.cpp:456 src/gui/setup_players.cpp:229
-#: src/gui/setup_players.cpp:336 src/gui/setup_players.cpp:341
-msgid "whispertab"
-msgstr ""
-
-#: src/gui/chat.cpp:472
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/chat.cpp:477 src/gui/widgets/chattab.cpp:83
-#: src/gui/widgets/chattab.cpp:201 src/net/ea/chathandler.cpp:120
-#: src/net/ea/chathandler.cpp:146 src/net/ea/chathandler.cpp:176
-#: src/net/manaserv/chathandler.cpp:161
-msgid " : "
-msgstr ""
-
 #: src/gui/confirmdialog.cpp:42
 msgid "Yes"
 msgstr ""
@@ -1139,29 +735,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:43 src/gui/confirmdialog.cpp:90
-#: src/gui/partywindow.cpp:213
-msgid "no"
-msgstr ""
-
-#: src/gui/connectiondialog.cpp:34 src/net/ea/charserverhandler.cpp:142
-#: src/net/manaserv/charhandler.cpp:108
-msgid "Info"
-msgstr ""
-
-#: src/gui/connectiondialog.cpp:38
-msgid "cancelButton"
-msgstr ""
-
-#: src/gui/connectiondialog.cpp:40 src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr ""
-
-#: src/gui/connectiondialog.cpp:56
-msgid "Cancel pressed"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:43 src/gui/debugwindow.cpp:45
+#: src/gui/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
@@ -1175,264 +749,101 @@ msgstr ""
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, c-format
 msgid "Music: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
 #, c-format
 msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:96
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
 #, c-format
 msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:104
-msgid "Music: "
-msgstr ""
-
-#: src/gui/debugwindow.cpp:104 src/gui/setup_audio.cpp:54
-#: src/gui/setup_audio.cpp:140 src/gui/updatewindow.cpp:459
-msgid "music"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:108
-msgid "Minimap: "
-msgstr ""
-
-#: src/gui/debugwindow.cpp:108 src/gui/minimap.cpp:100
-msgid "minimap"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:112
-msgid "Map: "
-msgstr ""
-
-#: src/gui/debugwindow.cpp:112
-msgid "_filename"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:116
 #, c-format
 msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:126
+#: src/gui/debugwindow.cpp:121
 #, c-format
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:68 src/gui/equipmentwindow.cpp:80
-#: src/gui/windowmenu.cpp:56 src/gui/windowmenu.cpp:114
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:86 src/gui/inventorywindow.cpp:76
-#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:283
-#: src/gui/popupmenu.cpp:370
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:86 src/gui/equipmentwindow.cpp:157
-#: src/gui/outfitwindow.cpp:72 src/gui/outfitwindow.cpp:155
-msgid "unequip"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:53 src/gui/guildwindow.cpp:56
-#: src/gui/guildwindow.cpp:57
-msgid "Guild"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:67
-msgid "Create Guild"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:67 src/gui/guildwindow.cpp:113
-msgid "CREATE_GUILD"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:68
-msgid "Invite User"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:68 src/gui/guildwindow.cpp:122
-msgid "INVITE_USER"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:69
-msgid "Quit Guild"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:69 src/gui/guildwindow.cpp:131
-msgid "QUIT_GUILD"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:117
-msgid "Guild Name"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:118
-msgid "Choose your guild's name."
-msgstr ""
-
-#: src/gui/guildwindow.cpp:119 src/gui/guildwindow.cpp:141
-msgid "CREATE_GUILD_OK"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:126
-msgid "Member Invite"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:127
-msgid "Who would you like to invite?"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:128 src/gui/guildwindow.cpp:158
-msgid "INVITE_USER_OK"
-msgstr ""
-
-#: src/gui/guildwindow.cpp:137
-#, c-format
-msgid "Guild %s quit."
-msgstr ""
-
-#: src/gui/guildwindow.cpp:154
-#, c-format
-msgid "Creating guild called %s."
-msgstr ""
-
-#: src/gui/guildwindow.cpp:168
-#, c-format
-msgid "Invited user %s."
-msgstr ""
-
-#: src/gui/guildwindow.cpp:173
-msgid "Sending invitation acceptance."
-msgstr ""
-
-#: src/gui/guildwindow.cpp:245
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr ""
-
-#: src/gui/guildwindow.cpp:249
-msgid "Accept Guild Invite"
-msgstr ""
-
-#: src/gui/help.cpp:35 src/gui/help.cpp:40
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:49 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:70
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/help.cpp:49 src/gui/help.cpp:69 src/gui/skilldialog.cpp:119
-#: src/gui/specialswindow.cpp:123 src/gui/storagewindow.cpp:70
-#: src/gui/storagewindow.cpp:148 src/gui/widgets/whispertab.cpp:61
-#: src/gui/widgets/whispertab.cpp:79 src/gui/widgets/whispertab.cpp:99
-msgid "close"
-msgstr ""
-
-#: src/gui/help.cpp:85
-msgid "header"
-msgstr ""
-
-#: src/gui/help.cpp:96
-msgid "help/"
-msgstr ""
-
-#: src/gui/help.cpp:96
-msgid ".txt"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:55 src/gui/inventorywindow.cpp:60
-#: src/gui/windowmenu.cpp:57 src/gui/windowmenu.cpp:118
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:71 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:285 src/gui/popupmenu.cpp:372
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:73
-#: src/gui/inventorywindow.cpp:289 src/gui/popupmenu.cpp:375
-#: src/gui/specialswindow.cpp:213
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:82 src/gui/inventorywindow.cpp:293
-#: src/gui/popupmenu.cpp:378
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:82 src/gui/inventorywindow.cpp:190
-#: src/gui/popupmenu.cpp:309
-msgid "drop"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:83 src/gui/popupmenu.cpp:384
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:194
-#: src/gui/popupmenu.cpp:303
-msgid "split"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:84 src/gui/outfitwindow.cpp:50
-#: src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:163
-msgid "outfit"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:95 src/gui/storagewindow.cpp:80
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:96
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:154 src/gui/storagewindow.cpp:83
-#: src/gui/storagewindow.cpp:121
-#, c-format
-msgid "%d/%d"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:155
-#, c-format
-msgid "%s/%s"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:295 src/gui/popupmenu.cpp:380
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:90 src/gui/itemamount.cpp:197
-msgid "slide"
-msgstr ""
-
 #: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:36
-#: src/gui/textdialog.cpp:77 src/gui/trade.cpp:74 src/gui/trade.cpp:76
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
 msgid "OK"
 msgstr ""
 
@@ -1440,10 +851,6 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:102 src/gui/itemamount.cpp:193
-msgid "all"
-msgstr ""
-
 #: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr ""
@@ -1464,11 +871,7 @@ msgstr ""
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:40
-msgid "ItemPopup"
-msgstr ""
-
-#: src/gui/itempopup.cpp:91
+#: src/gui/itempopup.cpp:92
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1485,151 +888,64 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:59 src/gui/login.cpp:116 src/gui/register.cpp:73
-#: src/gui/register.cpp:122 src/gui/register.cpp:123 src/gui/register.cpp:124
-#: src/gui/register.cpp:149
-msgid "register"
-msgstr ""
-
 #: src/gui/login.cpp:60
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/login.cpp:60 src/gui/login.cpp:112 src/gui/serverdialog.cpp:372
-#: src/main.cpp:561
-msgid "server"
-msgstr ""
-
-#: src/gui/login.cpp:61 src/gui/login.cpp:63 src/gui/login.cpp:64
-#: src/gui/login.cpp:100 src/gui/worldselectdialog.cpp:76
-#: src/gui/worldselectdialog.cpp:121
-msgid "login"
-msgstr ""
-
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/minimap.cpp:51
-msgid "Minimap"
-msgstr ""
-
-#: src/gui/minimap.cpp:52 src/gui/minimap.cpp:71
-msgid "Show"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/npcdialog.cpp:45
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:56
-msgid "NpcText"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:106
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:106 src/gui/npcdialog.cpp:202
-msgid "reset"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:134 src/gui/setup_video.cpp:461
-#: src/gui/updatewindow.cpp:265 src/gui/updatewindow.cpp:269
-msgid "\n"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:160
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
 msgid ""
 "\n"
 "> Next\n"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:195 src/gui/setup_colors.cpp:385
-#: src/gui/trade.cpp:323
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:199
-#, c-format
-msgid ""
-"\n"
-"> \"%s\"\n"
-msgstr ""
-
-#: src/gui/npcpostdialog.cpp:44
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51 src/gui/npcpostdialog.cpp:81
-msgid "send"
-msgstr ""
-
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:65 src/gui/outfitwindow.cpp:145
-msgid "previous"
-msgstr ""
-
-#: src/gui/outfitwindow.cpp:66 src/gui/outfitwindow.cpp:135
-msgid "next"
-msgstr ""
-
-#: src/gui/outfitwindow.cpp:67 src/gui/outfitwindow.cpp:142
-#: src/gui/outfitwindow.cpp:152
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:69
-msgid "Unequip first"
-msgstr ""
-
 #: src/gui/outfitwindow.cpp:70
-msgid "OutfitUnequip0"
-msgstr ""
-
-#: src/gui/outfitwindow.cpp:99 src/gui/outfitwindow.cpp:127
-msgid "Outfit"
-msgstr ""
-
-#: src/gui/outfitwindow.cpp:99 src/gui/skilldialog.cpp:203
-#: src/gui/specialswindow.cpp:187
-msgid "-1"
-msgstr ""
-
-#: src/gui/outfitwindow.cpp:113 src/gui/outfitwindow.cpp:128
-msgid "OutfitUnequip"
-msgstr ""
-
-#: src/gui/palette.cpp:51
-msgid "Color"
-msgstr ""
-
-#: src/gui/palette.cpp:80
-msgid "  "
+msgid "Unequip first"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -1693,204 +1009,156 @@ msgstr ""
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/gui/partywindow.cpp:55
-#: src/gui/partywindow.cpp:57 src/gui/partywindow.cpp:83
-#: src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/chathandler.cpp:98
-msgid "Server"
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
 msgstr ""
 
 #: src/gui/palette.cpp:103
-msgid "Logger"
+msgid "Server"
 msgstr ""
 
 #: src/gui/palette.cpp:104
+msgid "Logger"
+msgstr ""
+
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:109
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:115
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:118
+#: src/gui/palette.cpp:119
 msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:122
 msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:124
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:128
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:129
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:130
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:133
 msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:134
+#: src/gui/palette.cpp:135
 msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:139
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:140
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:141
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:152 src/gui/palette.cpp:285
-msgid "Gradient"
-msgstr ""
-
-#: src/gui/palette.cpp:155 src/gui/palette.cpp:286
-msgid "Delay"
-msgstr ""
-
-#: src/gui/palette.cpp:160 src/gui/palette.cpp:276
-#, c-format
-msgid "0x%06x"
-msgstr ""
-
-#: src/gui/partywindow.cpp:78
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:178
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:186
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:189
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:195
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:208
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
-
-#: src/gui/partywindow.cpp:215
-#, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:58
-msgid "PopupMenu"
-msgstr ""
-
 #: src/gui/popupmenu.cpp:84
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, c-format
 msgid "Attack %s"
 msgstr ""
@@ -1900,148 +1168,80 @@ msgstr ""
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:101
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:106
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:108
+#: src/gui/popupmenu.cpp:109
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:117
+#: src/gui/popupmenu.cpp:118
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:130
+#, c-format
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
 #, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:136
+#: src/gui/popupmenu.cpp:137
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:143
+#: src/gui/popupmenu.cpp:144
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152
+#: src/gui/popupmenu.cpp:153
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:166
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:174
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190
+#: src/gui/popupmenu.cpp:191
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:206
-msgid "talk"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:215 src/gui/trade.cpp:240 src/gui/trade.cpp:304
-msgid "trade"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:223 src/resources/itemdb.cpp:52
-#: src/resources/monsterdb.cpp:129 src/resources/monsterdb.cpp:135
-msgid "attack"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:229
-msgid "/w \""
-msgstr ""
-
-#: src/gui/popupmenu.cpp:245
-msgid "disregard"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:252
-msgid "friend"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:259
-msgid "guild"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:272
-msgid "pickup"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:278
-msgid "look"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:298
-msgid "chat"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:315 src/gui/storagewindow.cpp:67
-#: src/gui/storagewindow.cpp:127
-msgid "store"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:321 src/gui/storagewindow.cpp:68
-#: src/gui/storagewindow.cpp:138
-msgid "retrieve"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:332 src/gui/serverdialog.cpp:383
-#: src/gui/skilldialog.cpp:189 src/gui/skilldialog.cpp:204
-#: src/gui/specialswindow.cpp:173 src/gui/specialswindow.cpp:190
-#: src/playerrelations.cpp:38 src/resources/itemdb.cpp:147
-#: src/resources/monsterdb.cpp:67
-msgid "name"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:338
-msgid "admin-kick"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:349
-#, c-format
-msgid "PopupMenu: Warning, unknown action '%s'"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:389 src/gui/storagewindow.cpp:67
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
 msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:396 src/gui/storagewindow.cpp:68
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:42 src/gui/quitdialog.cpp:43
-#: src/gui/quitdialog.cpp:44 src/gui/quitdialog.cpp:45
-msgid "quitdialog"
-msgstr ""
-
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
@@ -2050,39 +1250,31 @@ msgstr ""
 msgid "Switch character"
 msgstr ""
 
-#: src/gui/recorder.cpp:40
-msgid "Recorder"
-msgstr ""
-
-#: src/gui/recorder.cpp:45
-msgid "activate"
-msgstr ""
-
-#: src/gui/recorder.cpp:88
+#: src/gui/recorder.cpp:87
 msgid "Finishing recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:92
+#: src/gui/recorder.cpp:91
 msgid "Not currently recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:97
+#: src/gui/recorder.cpp:96
 msgid "Already recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:105
+#: src/gui/recorder.cpp:104
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
@@ -2090,19 +1282,10 @@ msgstr ""
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:90 src/gui/register.cpp:91
-msgid "sex"
-msgstr ""
-
 #: src/gui/register.cpp:100
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:152
-#, c-format
-msgid "RegisterDialog::register Username is %s"
-msgstr ""
-
 #: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
@@ -2113,12 +1296,12 @@ msgstr ""
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:118
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:125
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
@@ -2127,150 +1310,47 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/sdlinput.cpp:79 src/gui/sdlinput.cpp:99
-msgid "The queue is empty."
-msgstr ""
-
-#: src/gui/sell.cpp:74 src/gui/sell.cpp:182
-msgid "sell"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:87
+#: src/gui/serverdialog.cpp:134
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:94 src/gui/widgets/chattab.cpp:135
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:95
+#: src/gui/serverdialog.cpp:142
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:106 src/gui/serverdialog.cpp:228
-msgid "MostUsedServerName"
+#: src/gui/serverdialog.cpp:143
+msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:109 src/gui/serverdialog.cpp:230
-msgid "MostUsedServerPort"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:128
+#: src/gui/serverdialog.cpp:183
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:128 src/gui/serverdialog.cpp:131
-#: src/gui/serverdialog.cpp:132 src/gui/serverdialog.cpp:191
-msgid "connect"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:129
-msgid "Add Entry"
+#: src/gui/serverdialog.cpp:184
+msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:129 src/gui/serverdialog.cpp:249
-msgid "addEntry"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:197
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:215
-msgid "MostUsedServerName0"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:216
-msgid "MostUsedServerPort0"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:411
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:302
+#: src/gui/serverdialog.cpp:417
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:306
+#: src/gui/serverdialog.cpp:421
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:343
-msgid "onlineServerList"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:343 src/gui/serverdialog.cpp:345
-msgid "void"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:362 src/main.cpp:565
-msgid "version"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:366
-msgid "Online server list has wrong version"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:376 src/gui/updatewindow.cpp:72
-#: src/resources/itemdb.cpp:143
-msgid "type"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:376
-msgid "unknown"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:387
-msgid "connection"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:389
-msgid "manaserv"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:393
-msgid "eathena"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:401
-msgid "hostname"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:402 src/main.cpp:312 src/main.cpp:560
-msgid "port"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:448
-#, c-format
-msgid "Error retreiving server list: %s\n"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:38 src/gui/setup_audio.cpp:86
-#: src/gui/setup_audio.cpp:130 src/gui/setup_audio.cpp:142 src/main.cpp:324
-#: src/main.cpp:467
-msgid "musicVolume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:39 src/gui/setup_audio.cpp:85
-#: src/gui/setup_audio.cpp:129 src/gui/setup_audio.cpp:137 src/main.cpp:323
-#: src/main.cpp:465
-msgid "sfxVolume"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:40 src/gui/setup_audio.cpp:88
-#: src/gui/setup_audio.cpp:127 src/main.cpp:320 src/main.cpp:462
-#: src/resources/itemdb.cpp:196 src/resources/monsterdb.cpp:99
-msgid "sound"
-msgstr ""
-
-#: src/gui/setup_audio.cpp:41 src/gui/setup_audio.cpp:92
-#: src/gui/setup_audio.cpp:96 src/gui/setup_audio.cpp:128
-#: src/gui/updatewindow.cpp:459
-msgid "download-music"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
@@ -2291,10 +1371,6 @@ msgstr ""
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53 src/gui/setup_audio.cpp:135
-msgid "sfx"
-msgstr ""
-
 #: src/gui/setup_audio.cpp:94
 msgid "Notice"
 msgstr ""
@@ -2307,88 +1383,58 @@ msgstr ""
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:107 src/main.cpp:474
-#, c-format
-msgid "Warning: %s"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
+#: src/gui/setup_colors.cpp:70
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:75 src/gui/setup_colors.cpp:192
-msgid "slider_grad"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
 #: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
 #: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
 #: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:92
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:104 src/gui/setup_colors.cpp:199
-msgid "slider_graddelay"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:108
+#: src/gui/setup_colors.cpp:107
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:119 src/gui/setup_colors.cpp:206
-msgid "slider_red"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:123
+#: src/gui/setup_colors.cpp:122
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:134 src/gui/setup_colors.cpp:213
-msgid "slider_green"
-msgstr ""
-
-#: src/gui/setup_colors.cpp:138
+#: src/gui/setup_colors.cpp:137
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:149 src/gui/setup_colors.cpp:220
-msgid "slider_blue"
-msgstr ""
-
-#: src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62 src/gui/windowmenu.cpp:138
-#: src/main.cpp:879 src/main.cpp:1287
-msgid "Setup"
-msgstr ""
-
-#: src/gui/setup.cpp:51 src/gui/setup.cpp:101
+#: src/gui/setup.cpp:51
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51 src/gui/setup.cpp:62 src/gui/setup.cpp:111
+#: src/gui/setup.cpp:51
 msgid "Reset Windows"
 msgstr ""
 
@@ -2400,10 +1446,6 @@ msgstr ""
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38
-msgid "calibrate"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr ""
@@ -2412,10 +1454,6 @@ msgstr ""
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:43 src/gui/setup_joystick.cpp:101
-msgid "joystickEnabled"
-msgstr ""
-
 #: src/gui/setup_joystick.cpp:83
 msgid "Stop"
 msgstr ""
@@ -2432,485 +1470,446 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86 src/gui/setup_keyboard.cpp:144
-msgid "assign"
-msgstr ""
-
 #: src/gui/setup_keyboard.cpp:90
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90 src/gui/setup_keyboard.cpp:153
-msgid "makeDefault"
-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_keyboard.cpp:151
-msgid ": ?"
+msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:165 src/gui/widgets/chattab.cpp:127
-#: src/gui/widgets/chattab.cpp:131 src/gui/widgets/chattab.cpp:159
-msgid ": "
-msgstr ""
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:214
-msgid "table"
-msgstr ""
-
-#: src/gui/setup_players.cpp:215
-msgid "strategy"
-msgstr ""
-
-#: src/gui/setup_players.cpp:216
-msgid "whisper tab"
-msgstr ""
-
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr ""
-
 #: src/gui/setup_players.cpp:232
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:257
-msgid "When ignoring:"
+msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_video.cpp:94
-msgid "No modes available"
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_video.cpp:96
-msgid "All resolutions available"
+#: src/gui/setup_players.cpp:236
+msgid "Players"
 msgstr ""
 
-#: src/gui/setup_video.cpp:103 src/gui/setup_video.cpp:452
-#: src/gui/setup_video.cpp:453
-msgid "x"
+#: src/gui/setup_players.cpp:261
+msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:152 src/gui/setup_video.cpp:214
-#: src/gui/setup_video.cpp:414 src/gui/setup_video.cpp:528
-msgid "OverlayDetail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:156
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157 src/gui/setup_video.cpp:170
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:166 src/gui/setup_video.cpp:217
-#: src/gui/setup_video.cpp:534
-msgid "particleEmitterSkip"
+#: src/gui/setup_video.cpp:172
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:171 src/resources/monsterdb.cpp:70
-#: src/resources/monsterdb.cpp:75
-msgid "medium"
+#: src/gui/setup_video.cpp:174
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:344
-#: src/gui/setup_video.cpp:387 src/gui/setup_video.cpp:406
-#: src/gui/setup_video.cpp:433 src/main.cpp:319 src/main.cpp:438
-msgid "screen"
+#: src/gui/setup_video.cpp:196
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:355
-#: src/gui/setup_video.cpp:393 src/gui/setup_video.cpp:415
-#: src/gui/setup_video.cpp:442 src/main.cpp:315 src/main.cpp:317
-#: src/main.cpp:423
-msgid "opengl"
+#: src/gui/setup_video.cpp:197
+msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:181 src/gui/setup_video.cpp:252
-#: src/gui/setup_video.cpp:407 src/gui/setup_video.cpp:434
-#: src/gui/setup_video.cpp:475 src/gui/setup_video.cpp:477 src/main.cpp:329
-msgid "customcursor"
+#: src/gui/setup_video.cpp:198
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:182 src/gui/setup_video.cpp:253
-#: src/gui/setup_video.cpp:408 src/gui/setup_video.cpp:435
-#: src/gui/setup_video.cpp:479 src/gui/setup_video.cpp:481
-msgid "visiblenames"
+#: src/gui/setup_video.cpp:200
+msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:183 src/gui/setup_video.cpp:254
-#: src/gui/setup_video.cpp:409 src/gui/setup_video.cpp:436
-#: src/gui/setup_video.cpp:483 src/gui/setup_video.cpp:485
-msgid "particleeffects"
+#: src/gui/setup_video.cpp:202
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:184 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:410 src/gui/setup_video.cpp:438
-#: src/gui/setup_video.cpp:511 src/gui/setup_video.cpp:517
-#: src/localplayer.cpp:126 src/localplayer.cpp:127 src/localplayer.cpp:135
-#: src/localplayer.cpp:1149 src/localplayer.cpp:1151
-msgid "showownname"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:185 src/gui/setup_video.cpp:416
-#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:497
-#: src/localplayer.cpp:972 src/localplayer.cpp:979
-msgid "showpickupchat"
+#: src/gui/setup_video.cpp:205
+msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:186 src/gui/setup_video.cpp:417
-#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:501
-#: src/localplayer.cpp:989
-msgid "showpickupparticle"
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
+msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:413 src/gui/setup_video.cpp:441
-#: src/gui/setup_video.cpp:471 src/gui/setup_video.cpp:473 src/main.cpp:321
-msgid "guialpha"
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
+msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:190 src/gui/setup_video.cpp:260
-#: src/gui/setup_video.cpp:412 src/gui/setup_video.cpp:437
-#: src/gui/setup_video.cpp:504 src/gui/setup_video.cpp:509
-msgid "speech"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
-msgid "Full screen"
+#: src/gui/setup_video.cpp:225
+msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:194
-msgid "OpenGL"
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:233
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
-msgid "Visible names"
+#: src/gui/setup_video.cpp:234
+msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:199
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:235
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:201
-msgid "Show own name"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:202
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:237
+msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:204
-msgid "in chat"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:206
-msgid "as particle"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:211
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220 src/gui/setup_video.cpp:403
-msgid "fontSize"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Video"
+#: src/gui/setup_video.cpp:399
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:228
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:412
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:230
-msgid "Particle detail"
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:231
-msgid "Font size"
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:449
-msgid "videomode"
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:495
-msgid "pickupchat"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/setup_video.cpp:256 src/gui/setup_video.cpp:499
-msgid "pickupparticle"
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+msgid "Skills"
 msgstr ""
 
-#: src/gui/setup_video.cpp:259 src/gui/setup_video.cpp:537
-msgid "fpslimitcheckbox"
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:519
-msgid "fpslimitslider"
+#: src/gui/skilldialog.cpp:262
+#, c-format
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262 src/gui/setup_video.cpp:524
-msgid "overlaydetailslider"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "overlaydetailfield"
+#: src/gui/skilldialog.cpp:323
+#, c-format
+msgid "Skill %d"
 msgstr ""
 
-#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:530
-msgid "particledetailslider"
+#: src/gui/skilldialog.cpp:405
+#, c-format
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:265
-msgid "particledetailfield"
+#: src/gui/skilldialog.cpp:416
+#, c-format
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/setup_video.cpp:366
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/setup_video.cpp:372
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/setup_video.cpp:383
-msgid "Switching to Full Screen"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/setup_video.cpp:384
-msgid "Restart needed for changes to take effect."
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/setup_video.cpp:396
-msgid "Changing to OpenGL"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/setup_video.cpp:397
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/socialwindow.cpp:147
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/setup_video.cpp:459 src/gui/setup_video.cpp:464
-msgid "Screen Resolution Changed"
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:465
-msgid "Restart your client for the change to take effect."
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/setup_video.cpp:462
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/setup_video.cpp:468 src/main.cpp:435 src/main.cpp:884
-msgid "screenwidth"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/setup_video.cpp:469 src/main.cpp:436 src/main.cpp:886
-msgid "screenheight"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/setup_video.cpp:491
-msgid "Particle Effect Settings Changed."
+#: src/gui/socialwindow.cpp:210
+#, c-format
+msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/setup_video.cpp:492
-msgid "Changes will take effect on map change."
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:85 src/gui/skilldialog.cpp:87
-#: src/gui/windowmenu.cpp:58 src/gui/windowmenu.cpp:122
-msgid "Skills"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+msgid "Create Party"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:141
-#, c-format
-msgid "Skill points available: %d"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:173
-msgid "skills"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:175
+#: src/gui/socialwindow.cpp:394
 #, c-format
-msgid "Error loading skills file: %s"
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:186 src/gui/specialswindow.cpp:170
-msgid "set"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:189
+#: src/gui/socialwindow.cpp:413
 #, c-format
-msgid "Skill Set %d"
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:201
-msgid "skill"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:203 src/gui/specialswindow.cpp:187
-#: src/resources/itemdb.cpp:131 src/resources/monsterdb.cpp:131
-#: src/resources/monsterdb.cpp:144
-msgid "id"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:204
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Skill %d"
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:205 src/gui/specialswindow.cpp:191
-msgid "icon"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:240 src/gui/specialswindow.cpp:212
-msgid "999"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:252 src/gui/specialswindow.cpp:222
-msgid "graphics/gui/unknown-item.png"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:315
+#: src/gui/socialwindow.cpp:502
 #, c-format
-msgid "Lvl: %d (%+d)"
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:320
-#, c-format
-msgid "Lvl: %d"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:326 src/resources/itemdb.cpp:169
-#: src/resources/itemdb.cpp:177 src/resources/itemdb.cpp:182
-msgid " / "
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:84 src/gui/specialswindow.cpp:86
-#: src/gui/windowmenu.cpp:59 src/gui/windowmenu.cpp:126
-msgid "Specials"
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:157
-msgid "specials"
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:159
+#: src/gui/socialwindow.cpp:541
 #, c-format
-msgid "Error loading specials file: %s"
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:173
+#: src/gui/socialwindow.cpp:546
 #, c-format
-msgid "Specials Set %d"
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:185
-msgid "special"
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:190
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
 #, c-format
-msgid "Special %d"
+msgid "Specials Set %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:87 src/gui/windowmenu.cpp:55
-#: src/gui/windowmenu.cpp:110
-msgid "Status"
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
 msgstr ""
 
 #: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
@@ -2944,10 +1943,6 @@ msgstr ""
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161 src/gui/statuswindow.cpp:166 src/main.cpp:686
-msgid "C"
-msgstr ""
-
 #: src/gui/statuswindow.cpp:194
 msgid "HP"
 msgstr ""
@@ -2982,82 +1977,56 @@ msgstr ""
 msgid "Level"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:416
-#, c-format
-msgid "%2.2f"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:416
-msgid "%"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:456
-#, c-format
-msgid " (%+d)"
-msgstr ""
-
-#: src/gui/storagewindow.cpp:55 src/gui/storagewindow.cpp:59
+#: src/gui/storagewindow.cpp:58
 msgid "Storage"
 msgstr ""
 
-#: src/gui/textdialog.cpp:37 src/gui/textdialog.cpp:77
-msgid "CANCEL"
-msgstr ""
-
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:56
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:59
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:66 src/gui/trade.cpp:75 src/gui/trade.cpp:76
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:78
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:78 src/gui/trade.cpp:257
-msgid "add"
-msgstr ""
-
-#: src/gui/trade.cpp:100 src/gui/trade.cpp:136
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:105
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:105 src/gui/trade.cpp:310
-msgid "money"
-msgstr ""
-
-#: src/gui/trade.cpp:276
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:319
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
@@ -3066,88 +2035,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:105
-#, c-format
-msgid "UnregisterDialog::unregistered, Username is %s"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:57
-msgid "updates"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:59 src/gui/updatewindow.cpp:114
-#, c-format
-msgid "Error loading update file: %s"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:66
-msgid "update"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:70
-msgid "file"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:71
-msgid "hash"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:72 src/gui/updatewindow.cpp:105 src/main.cpp:388
-#: src/main.cpp:402 src/main.cpp:553
-msgid "data"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:73 src/resources/itemdb.cpp:149
-msgid "description"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:74
-msgid "required"
-msgstr ""
-
 #: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:128
-msgid "news.txt"
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
 msgstr ""
 
 #: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145 src/gui/updatewindow.cpp:221
-msgid "play"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:254
-msgid "Couldn't load news"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:399
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:401
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:403
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:430
-#, c-format
-msgid "Warning this server does not have a %s file falling back to %s"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:482
-#, c-format
-msgid "%s already here"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:495
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -3171,10 +2085,6 @@ msgstr ""
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:61 src/gui/widgets/channeltab.cpp:97
-msgid "users"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:63
 msgid "Command: /users"
 msgstr ""
@@ -3183,11 +2093,6 @@ msgstr ""
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:66 src/gui/widgets/channeltab.cpp:101
-#: src/gui/widgets/channeltab.cpp:105
-msgid "topic"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
 msgstr ""
@@ -3208,10 +2113,6 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:78 src/gui/widgets/channeltab.cpp:113
-msgid "op"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
@@ -3224,11 +2125,6 @@ msgstr ""
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:87 src/gui/widgets/channeltab.cpp:121
-#: src/net/ea/gui/partytab.cpp:125
-msgid "kick"
-msgstr ""
-
 #: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
@@ -3245,113 +2141,61 @@ msgstr ""
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:51 src/main.cpp:330
-msgid "ChatLogLength"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:92
-msgid "Welcome"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:108 src/gui/widgets/chattab.cpp:132
-msgid "##C"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:116
-msgid "##G"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:123
-msgid "##1"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:128
-msgid "##Y"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:138 src/gui/widgets/chattab.cpp:162
-msgid "##S"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:143
-msgid "##2"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:147
-msgid "##W"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:150
-msgid "##I"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:155
-msgid "##L"
-msgstr ""
-
-#: src/gui/widgets/chattab.cpp:235
-msgid "|"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:50
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:70
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:71
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:81
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:86
+#: src/gui/widgets/whispertab.cpp:87
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
+#: src/gui/widgets/whispertab.cpp:88
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:93
+#: src/gui/widgets/whispertab.cpp:94
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:54 src/gui/windowmenu.cpp:89
-msgid ":-)"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:60 src/gui/windowmenu.cpp:130
-msgid "Guilds"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:61 src/gui/windowmenu.cpp:134
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr ""
 
@@ -3367,979 +2211,276 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77 src/gui/worldselectdialog.cpp:111
-msgid "world"
-msgstr ""
-
-#: src/keyboardconfig.cpp:41
-msgid "keyMoveUp"
-msgstr ""
-
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
-msgid "keyMoveDown"
-msgstr ""
-
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
-msgid "keyMoveLeft"
-msgstr ""
-
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
-msgid "keyMoveRight"
-msgstr ""
-
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "keyAttack"
-msgstr ""
-
-#: src/keyboardconfig.cpp:45 src/net/ea/generalhandler.cpp:216
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "keyTargetAttack"
-msgstr ""
-
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "keySmilie"
-msgstr ""
-
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
-msgid "keyTalk"
-msgstr ""
-
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "keyTarget"
-msgstr ""
-
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "keyTargetClosest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
-msgid "Target Closest"
-msgstr ""
-
-#: src/keyboardconfig.cpp:51
-msgid "keyTargetNPC"
-msgstr ""
-
-#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
-msgid "keyTargetPlayer"
-msgstr ""
-
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
-msgid "keyPickup"
-msgstr ""
-
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
-msgid "keyHideWindows"
-msgstr ""
-
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
-msgid "keyBeingSit"
-msgstr ""
-
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
-msgid "keyScreenshot"
-msgstr ""
-
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "keyTrade"
-msgstr ""
-
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
-msgid "keyPathfind"
-msgstr ""
-
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
-msgid "keyShortcut1"
-msgstr ""
-
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
-msgid "keyShortcut2"
-msgstr ""
-
-#: src/keyboardconfig.cpp:61
-msgid "keyShortcut3"
-msgstr ""
-
-#: src/keyboardconfig.cpp:62
-msgid "keyShortcut4"
-msgstr ""
-
-#: src/keyboardconfig.cpp:63
-msgid "keyShortcut5"
-msgstr ""
-
-#: src/keyboardconfig.cpp:64
-msgid "keyShortcut6"
-msgstr ""
-
-#: src/keyboardconfig.cpp:65
-msgid "keyShortcut7"
-msgstr ""
-
-#: src/keyboardconfig.cpp:66
-msgid "keyShortcut8"
-msgstr ""
-
-#: src/keyboardconfig.cpp:67
-msgid "keyShortcut9"
-msgstr ""
-
-#: src/keyboardconfig.cpp:68
-msgid "keyShortcut10"
-msgstr ""
-
-#: src/keyboardconfig.cpp:69
-msgid "keyShortcut11"
-msgstr ""
-
 #: src/keyboardconfig.cpp:70
-msgid "keyShortcut12"
-msgstr ""
-
-#: src/keyboardconfig.cpp:71
-msgid "keyWindowHelp"
-msgstr ""
-
-#: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
-msgid "keyWindowStatus"
-msgstr ""
-
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
-msgid "keyWindowInventory"
-msgstr ""
-
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
-msgid "keyWindowEquipment"
-msgstr ""
-
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
-msgid "keyWindowSkill"
-msgstr ""
-
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
-msgid "keyWindowMinimap"
-msgstr ""
-
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
-msgid "keyWindowChat"
-msgstr ""
-
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
-msgid "keyWindowShortcut"
-msgstr ""
-
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
-msgid "keyWindowSetup"
-msgstr ""
-
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
-msgid "keyWindowDebug"
-msgstr ""
-
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
-msgid "keyWindowParty"
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr ""
-
-#: src/keyboardconfig.cpp:82
-msgid "keyWindowEmoteBar"
-msgstr ""
-
-#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "keyWindowOutfit"
+#: src/keyboardconfig.cpp:82
+msgid "Outfits Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:83
-msgid "Outfits Window"
+msgid "Wear Outfit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:84
-msgid "keyEmoteShortcut1"
+msgid "Copy Outfit"
 msgstr ""
 
-#: 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 src/keyboardconfig.cpp:95
+#: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85
-msgid "keyEmoteShortcut2"
-msgstr ""
-
-#: src/keyboardconfig.cpp:86
-msgid "keyEmoteShortcut3"
-msgstr ""
-
-#: src/keyboardconfig.cpp:87
-msgid "keyEmoteShortcut4"
-msgstr ""
-
-#: src/keyboardconfig.cpp:88
-msgid "keyEmoteShortcut5"
-msgstr ""
-
-#: src/keyboardconfig.cpp:89
-msgid "keyEmoteShortcut6"
-msgstr ""
-
-#: src/keyboardconfig.cpp:90
-msgid "keyEmoteShortcut7"
-msgstr ""
-
-#: src/keyboardconfig.cpp:91
-msgid "keyEmoteShortcut8"
-msgstr ""
-
-#: src/keyboardconfig.cpp:92
-msgid "keyEmoteShortcut9"
-msgstr ""
-
-#: src/keyboardconfig.cpp:93
-msgid "keyEmoteShortcut10"
-msgstr ""
-
-#: src/keyboardconfig.cpp:94
-msgid "keyEmoteShortcut11"
-msgstr ""
-
-#: src/keyboardconfig.cpp:95
-msgid "keyEmoteShortcut12"
-msgstr ""
-
-#: src/keyboardconfig.cpp:96
-msgid "keyChat"
-msgstr ""
-
-#: src/keyboardconfig.cpp:96
-msgid "Toggle Chat"
-msgstr ""
-
-#: src/keyboardconfig.cpp:97
-msgid "keyChatScrollUp"
-msgstr ""
-
 #: src/keyboardconfig.cpp:97
-msgid "Scroll Chat Up"
-msgstr ""
-
-#: src/keyboardconfig.cpp:98
-msgid "keyChatScrollDown"
+msgid "Toggle Chat"
 msgstr ""
 
 #: src/keyboardconfig.cpp:98
-msgid "Scroll Chat Down"
-msgstr ""
-
-#: src/keyboardconfig.cpp:99
-msgid "keyChatPrevTab"
+msgid "Scroll Chat Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:99
-msgid "Previous Chat Tab"
-msgstr ""
-
-#: src/keyboardconfig.cpp:100
-msgid "keyChatNextTab"
+msgid "Scroll Chat Down"
 msgstr ""
 
 #: src/keyboardconfig.cpp:100
-msgid "Next Chat Tab"
-msgstr ""
-
-#: src/keyboardconfig.cpp:101
-msgid "keyOK"
+msgid "Previous Chat Tab"
 msgstr ""
 
 #: src/keyboardconfig.cpp:101
-msgid "Select OK"
+msgid "Next Chat Tab"
 msgstr ""
 
 #: src/keyboardconfig.cpp:102
-msgid "keyQuit"
-msgstr ""
-
-#: src/keyboardconfig.cpp:103
-msgid "keyIgnoreInput1"
-msgstr ""
-
-#: src/keyboardconfig.cpp:103
-msgid "Ignore input 1"
+msgid "Select OK"
 msgstr ""
 
 #: src/keyboardconfig.cpp:104
-msgid "keyIgnoreInput2"
+msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:695
+#: src/keyboardconfig.cpp:178
 #, c-format
-msgid "SpecialUpdate Skill #%d -- (%d/%d) -> %d"
-msgstr ""
-
-#: src/localplayer.cpp:782
-msgid "sfx/fist-swish.ogg"
-msgstr ""
-
-#: src/localplayer.cpp:888
-#, c-format
-msgid "%d %s xp"
-msgstr ""
-
-#: src/localplayer.cpp:928
-msgid " xp"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:974
+#: src/localplayer.cpp:913
 msgid "Unable to pick up item."
 msgstr ""
 
-#: src/localplayer.cpp:983 src/localplayer.cpp:984
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
-msgstr ""
-
-#: src/localplayer.cpp:1093
-msgid "graphics/gui/target-cursor-blue-s.png"
-msgstr ""
-
-#: src/localplayer.cpp:1095
-msgid "graphics/gui/target-cursor-red-s.png"
-msgstr ""
-
-#: src/localplayer.cpp:1097
-msgid "graphics/gui/target-cursor-blue-m.png"
-msgstr ""
-
-#: src/localplayer.cpp:1099
-msgid "graphics/gui/target-cursor-red-m.png"
-msgstr ""
-
-#: src/localplayer.cpp:1101
-msgid "graphics/gui/target-cursor-blue-l.png"
-msgstr ""
-
-#: src/localplayer.cpp:1103
-msgid "graphics/gui/target-cursor-red-l.png"
-msgstr ""
-
-#: src/main.cpp:202 src/main.cpp:328
-msgid "updatehost"
-msgstr ""
-
-#: src/main.cpp:202
-msgid "http://updates.themanaworld.org/"
-msgstr ""
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:211
-msgid "://"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:216 src/main.cpp:229
-msgid "updates/"
-msgstr ""
-
-#: src/main.cpp:221
-#, c-format
-msgid "Error: Invalid update host: %s"
-msgstr ""
-
-#: src/main.cpp:222
-#, c-format
-msgid "Invalid update host: %s"
-msgstr ""
-
-#: src/main.cpp:228
-msgid "Warning: no protocol was specified for the update host"
-msgstr ""
-
-#: src/main.cpp:241 src/main.cpp:246
-msgid "\\"
-msgstr ""
-
-#: src/main.cpp:253
-#, c-format
-msgid "Error: %s can't be made, but doesn't exist!"
-msgstr ""
-
-#: src/main.cpp:255 src/main.cpp:261
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:259
-#, c-format
-msgid "Error: %s/%s can't be made, but doesn't exist!"
-msgstr ""
-
-#: src/main.cpp:281
-msgid "/Library/Application Support/"
-msgstr ""
-
-#: src/main.cpp:282 src/main.cpp:371
-msgid "appName"
-msgstr ""
-
-#: src/main.cpp:282
-msgid "Mana"
-msgstr ""
-
-#: src/main.cpp:285
-msgid "/."
-msgstr ""
-
-#: src/main.cpp:285
-msgid "appShort"
-msgstr ""
-
-#: src/main.cpp:285 src/main.cpp:520 src/main.cpp:694 src/main.cpp:696
-#: src/main.cpp:699 src/main.cpp:700
-msgid "mana"
-msgstr ""
-
-#: src/main.cpp:297
-#, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
-
-#: src/main.cpp:308
-msgid "Initializing configuration..."
-msgstr ""
-
-#: src/main.cpp:309 src/main.cpp:787
-msgid "defaultServer"
-msgstr ""
-
-#: src/main.cpp:310 src/main.cpp:788
-msgid "server.themanaworld.org"
-msgstr ""
-
-#: src/main.cpp:311 src/main.cpp:791
-msgid "defaultPort"
-msgstr ""
-
-#: src/main.cpp:313 src/main.cpp:439
-msgid "hwaccel"
-msgstr ""
-
-#: src/main.cpp:322 src/main.cpp:683 src/main.cpp:783
-msgid "remember"
-msgstr ""
-
-#: src/main.cpp:326
-msgid "defaultUpdateHost"
-msgstr ""
-
-#: src/main.cpp:327
-msgid "http://updates.themanaworld.org"
-msgstr ""
-
-
-#: src/main.cpp:340
-msgid "r"
-msgstr ""
-
-#: src/main.cpp:345
-msgid "wt"
-msgstr ""
-
-#: src/main.cpp:348
-#, c-format
-msgid "Can't create %s. Using defaults."
-msgstr ""
-
-#: src/main.cpp:361
-msgid "Initializing SDL..."
-msgstr ""
-
-#: src/main.cpp:363
-#, c-format
-msgid "Could not initialize SDL: %s"
-msgstr ""
-
-#: src/main.cpp:371
-msgid "The Mana World"
-msgstr ""
-
-#: src/main.cpp:377
-#, c-format
-msgid "%s couldn't be set as home directory! Exiting."
-msgstr ""
-
-#: src/main.cpp:396
-#, c-format
-msgid "Can't find Resources directory\n"
-msgstr ""
-
-#: src/main.cpp:399
-msgid "/data"
-msgstr ""
-
-#: src/main.cpp:408
-msgid "A"
-msgstr ""
-
-#: src/main.cpp:414
-msgid "appIcon"
-msgstr ""
-
-#: src/main.cpp:414
-msgid "data/icons/mana.png"
-msgstr ""
-
-#: src/main.cpp:444
-#, c-format
-msgid "Couldn't set %dx%dx%d video mode: %s"
-msgstr ""
-
-#: src/main.cpp:521
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:522
-msgid "  -C --config-file    : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:523
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:524
-msgid "  -D --default        : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:526
+#: src/main.cpp:46
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:527
-msgid "  -S --home-dir       : Directory to use as home directory"
-msgstr ""
-
-#: src/main.cpp:528
-msgid "  -i --screenshot-dir : Directory to store screenshots"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:529
-msgid "  -H --update-host    : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:530
+#: src/main.cpp:49
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:531
+#: src/main.cpp:50
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:532
-msgid "  -p --port           : Login server port"
-msgstr ""
-
-#: src/main.cpp:533
+#: src/main.cpp:51
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:534
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-
-#: src/main.cpp:535
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#: src/main.cpp:537
-msgid "  -O --no-opengl      : Disable OpenGL for this session"
-msgstr ""
-
-#: src/main.cpp:539
-msgid "  -v --version        : Display the version"
-msgstr ""
-
-#: src/main.cpp:544
-#, c-format
-msgid "The Mana World %s"
-msgstr ""
-
-#: src/main.cpp:549
-msgid "hvud:U:P:Dc:s:p:C:H:S:Oi:"
-msgstr ""
-
-#: src/main.cpp:552
-msgid "config-file"
-msgstr ""
-
-#: src/main.cpp:554
-msgid "default"
-msgstr ""
-
-#: src/main.cpp:555
-msgid "password"
-msgstr ""
-
-#: src/main.cpp:556
-msgid "character"
-msgstr ""
-
-#: src/main.cpp:558
-msgid "home-dir"
-msgstr ""
-
-#: src/main.cpp:559
-msgid "update-host"
-msgstr ""
-
-#: src/main.cpp:562
-msgid "skip-update"
-msgstr ""
-
-#: src/main.cpp:563 src/main.cpp:681 src/main.cpp:795
-msgid "username"
-msgstr ""
-
-#: src/main.cpp:564
-msgid "no-opengl"
-msgstr ""
-
-#: src/main.cpp:566
-msgid "screenshot-dir"
-msgstr ""
-
-#: src/main.cpp:663 src/main.cpp:1134
-#, c-format
-msgid "Username is %s"
-msgstr ""
-
-#: src/main.cpp:692
-msgid "LANG="
-msgstr ""
-
-#: src/main.cpp:699
-msgid "UTF-8"
-msgstr ""
-
-#: src/main.cpp:756
-#, c-format
-msgid "Mana %s"
-msgstr ""
-
-#: src/main.cpp:759
-msgid "logToStandardOut"
-msgstr ""
-
-#: src/main.cpp:775
-msgid "loginMusic"
-msgstr ""
-
-#: src/main.cpp:775
-msgid "Magick - Real.ogg"
-msgstr ""
-
-#: src/main.cpp:914
-msgid "State: CHOOSE SERVER"
-msgstr ""
-
-#: src/main.cpp:937
-msgid "State: CONNECT SERVER"
-msgstr ""
-
-#: src/main.cpp:942
-msgid "State: LOGIN"
-msgstr ""
-
-#: src/main.cpp:959
-msgid "State: LOGIN ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:964
-msgid "State: WORLD SELECT"
-msgstr ""
-
-#: src/main.cpp:991
-msgid "State: WORLD SELECT ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1010
-msgid "State: UPDATE"
-msgstr ""
-
-#: src/main.cpp:1017
-msgid "State: LOAD DATA"
-msgstr ""
-
-#: src/main.cpp:1025
-msgid "customdata/"
-msgstr ""
-
-#: src/main.cpp:1026
-msgid "zip"
-msgstr ""
-
-#: src/main.cpp:1046
-msgid "State: GET CHARACTERS"
-msgstr ""
-
-#: src/main.cpp:1051
-msgid "State: CHAR SELECT"
-msgstr ""
-
-#: src/main.cpp:1064 src/main.cpp:1079
-msgid "lastCharacter"
-msgstr ""
-
-#: src/main.cpp:1070
-msgid "State: CONNECT GAME"
-msgstr ""
-
-#: src/main.cpp:1077
-#, c-format
-msgid "Memorizing selected character %s"
-msgstr ""
-
-#: src/main.cpp:1097
-msgid "State: GAME"
-msgstr ""
-
-#: src/main.cpp:1109
-msgid "State: LOGIN ERROR"
-msgstr ""
-
-#: src/main.cpp:1116
-msgid "State: ACCOUNT CHANGE ERROR"
-msgstr ""
-
-#: src/main.cpp:1123
-msgid "State: REGISTER_PREP"
-msgstr ""
-
-#: src/main.cpp:1129
-msgid "State: REGISTER"
-msgstr ""
-
-#: src/main.cpp:1141
-msgid "State: CHANGE PASSWORD"
-msgstr ""
-
-#: src/main.cpp:1146
-msgid "State: CHANGE PASSWORD ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1153
-msgid "State: CHANGE PASSWORD SUCCESS"
-msgstr ""
-
-#: src/main.cpp:1154
-msgid "Password Change"
-msgstr ""
-
-#: src/main.cpp:1155
-msgid "Password changed successfully!"
-msgstr ""
-
-#: src/main.cpp:1163
-msgid "State: CHANGE EMAIL"
-msgstr ""
-
-#: src/main.cpp:1168
-msgid "State: CHANGE EMAIL ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1173
-msgid "State: CHANGE EMAIL SUCCESS"
-msgstr ""
-
-#: src/main.cpp:1174
-msgid "Email Change"
-msgstr ""
-
-#: src/main.cpp:1175
-msgid "Email changed successfully!"
-msgstr ""
-
-#: src/main.cpp:1181
-msgid "State: UNREGISTER"
-msgstr ""
-
-#: src/main.cpp:1186
-msgid "State: UNREGISTER ATTEMPT"
-msgstr ""
-
-#: src/main.cpp:1192
-msgid "State: UNREGISTER SUCCESS"
-msgstr ""
-
-#: src/main.cpp:1195
-msgid "Unregister Successful"
-msgstr ""
-
-#: src/main.cpp:1196
-msgid "Farewell, come back any time..."
-msgstr ""
-
-#: src/main.cpp:1204
-msgid "State: SWITCH SERVER"
-msgstr ""
-
-#: src/main.cpp:1213
-msgid "State: SWITCH LOGIN"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:1221
-msgid "State: SWITCH CHARACTER"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:1230
-msgid "State: LOGOUT ATTEMPT"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:1235
-msgid "State: WAIT"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:1239
-msgid "State: EXIT"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1244
-msgid "State: FORCE QUIT"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1251
-msgid "State: ERROR"
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1275
-msgid "Quitting"
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
 #: src/net/ea/adminhandler.cpp:63
@@ -4350,706 +2491,530 @@ msgstr ""
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:98
-msgid "@kick "
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:108
-msgid "@ban "
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:118
-msgid "@unban "
-msgstr ""
-
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:75
-#, c-format
-msgid "CharServerHandler: Packet ID: %x, Length: %d"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:91
-#, c-format
-msgid "CharServer: Player: %s (%d)"
-msgstr ""
-
-#: src/net/ea/charserverhandler.cpp:101
+#: src/net/ea/charserverhandler.cpp:103
 msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:104
+#: src/net/ea/charserverhandler.cpp:106
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:107
+#: src/net/ea/charserverhandler.cpp:109
 msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:309
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:242 src/net/manaserv/charhandler.cpp:310
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:243 src/net/manaserv/charhandler.cpp:312
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:244 src/net/manaserv/charhandler.cpp:313
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:245 src/net/manaserv/charhandler.cpp:311
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:246
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:284
-msgid "a@a.com"
-msgstr ""
-
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:169
+#: src/net/ea/chathandler.cpp:171
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:186
-#, c-format
-msgid "*%s*"
-msgstr ""
-
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:74
-#, c-format
-msgid "Protocol: Player start position: (%d, %d), Direction: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:86
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:101
+#: src/net/ea/gamehandler.cpp:100
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:101
+#: src/net/ea/gamehandler.cpp:100
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:73
-msgid "EnableSync"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:97
-msgid "str"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:97
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:97 src/net/manaserv/generalhandler.cpp:98
-msgid "agi"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:97 src/net/manaserv/generalhandler.cpp:98
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:100
-msgid "vit"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:99 src/net/manaserv/generalhandler.cpp:101
-msgid "int"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:99 src/net/manaserv/generalhandler.cpp:101
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:100 src/net/manaserv/generalhandler.cpp:99
-msgid "dex"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:100 src/net/manaserv/generalhandler.cpp:99
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:101
-msgid "luck"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:101
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:119
-#, c-format
-msgid "Connection problem: %i"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:130
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:126
+#: src/net/ea/generalhandler.cpp:133
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/ea/generalhandler.cpp:137
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/ea/generalhandler.cpp:140
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:136
+#: src/net/ea/generalhandler.cpp:143
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:139
+#: src/net/ea/generalhandler.cpp:146
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:142
+#: src/net/ea/generalhandler.cpp:149
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:197
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:209 src/net/manaserv/generalhandler.cpp:169
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
 msgid "Strength"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:210 src/net/manaserv/generalhandler.cpp:170
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
 msgid "Agility"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:211 src/net/manaserv/generalhandler.cpp:172
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
 msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:212 src/net/manaserv/generalhandler.cpp:173
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
 msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:213 src/net/manaserv/generalhandler.cpp:171
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
 msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:214
+#: src/net/ea/generalhandler.cpp:221
 msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217
+#: src/net/ea/generalhandler.cpp:224
 msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218
+#: src/net/ea/generalhandler.cpp:225
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219
+#: src/net/ea/generalhandler.cpp:226
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220
+#: src/net/ea/generalhandler.cpp:227
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/ea/generalhandler.cpp:228
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:222
+#: src/net/ea/generalhandler.cpp:229
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:75 src/net/ea/gui/partytab.cpp:117
-msgid "invite"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:82 src/net/ea/gui/partytab.cpp:121
-msgid "leave"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
-msgid "This command causes the player to leave the party."
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87 src/net/ea/gui/partytab.cpp:129
-#: src/net/ea/gui/partytab.cpp:161 src/resources/itemdb.cpp:128
-msgid "item"
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 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:164
-#: src/net/ea/gui/partytab.cpp:196
-msgid "exp"
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:193
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:199
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:205
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:145
+#: src/net/ea/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:170
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:176
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:177 src/net/ea/partyhandler.cpp:182
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:180
+#: src/net/ea/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:152 src/net/ea/inventoryhandler.cpp:193
-#, c-format
-msgid ""
-"Index: %d, ID: %d, Type: %d, Identified: %d, Qty: %d, Cards: %d, %d, %d, %d"
-msgstr ""
-
-#: src/net/ea/inventoryhandler.cpp:262
+#: src/net/ea/inventoryhandler.cpp:281
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:358
+#: src/net/ea/inventoryhandler.cpp:391
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:372
+#: src/net/ea/inventoryhandler.cpp:402
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:392
-#, c-format
-msgid "Arrows equipped: %i"
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:78
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:81 src/net/manaserv/loginhandler.cpp:116
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:84
+#: src/net/ea/loginhandler.cpp:85
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:87 src/net/ea/loginhandler.cpp:173
-#: src/net/manaserv/charhandler.cpp:124 src/net/manaserv/charhandler.cpp:226
-#: src/net/manaserv/loginhandler.cpp:92 src/net/manaserv/loginhandler.cpp:122
-#: src/net/manaserv/loginhandler.cpp:155 src/net/manaserv/loginhandler.cpp:270
-#: src/net/manaserv/loginhandler.cpp:306
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:102
-#, c-format
-msgid "Received update host \"%s\" from login server."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:131
-#, c-format
-msgid "Network: Server: %s (%s:%d)"
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:143
-#, c-format
-msgid "Login::error code: %i"
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:147
+#: src/net/ea/loginhandler.cpp:149
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:150
+#: src/net/ea/loginhandler.cpp:152
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:153
+#: src/net/ea/loginhandler.cpp:155
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:156
+#: src/net/ea/loginhandler.cpp:158
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:163
+#: src/net/ea/loginhandler.cpp:165
 #, 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:170
+#: src/net/ea/loginhandler.cpp:172
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:257
-msgid "_F"
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:257
-msgid "_M"
-msgstr ""
-
-#: src/net/ea/network.cpp:138
-msgid "Tried to connect an already connected socket!"
-msgstr ""
-
 #: src/net/ea/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:149
-#, c-format
-msgid "Network::Connecting to %s:%i"
-msgstr ""
-
-#: src/net/ea/network.cpp:164
-msgid "Unable to create network worker thread"
-msgstr ""
-
-#: src/net/ea/network.cpp:232
-#, c-format
-msgid "Unhandled packet: %x"
-msgstr ""
-
-#: src/net/ea/network.cpp:251
-msgid "Error in SDLNet_TCP_Send(): "
-msgstr ""
-
-#: src/net/ea/network.cpp:326
-#, c-format
-msgid "Received packet 0x%x of length %d\n"
-msgstr ""
-
-#: src/net/ea/network.cpp:342
-msgid "Unable to resolve host \""
-msgstr ""
-
 #: src/net/ea/network.cpp:345
-#, c-format
-msgid "SDLNet_ResolveHost: %s"
-msgstr ""
-
-#: src/net/ea/network.cpp:354
-#, c-format
-msgid "Error in SDLNet_TCP_Open(): %s"
-msgstr ""
-
-#: src/net/ea/network.cpp:359
-#, c-format
-msgid "Network::Started session with %s:%i"
-msgstr ""
-
-#: src/net/ea/network.cpp:373
-msgid "Error in SDLNet_AllocSocketSet(): "
-msgstr ""
-
-#: src/net/ea/network.cpp:380
-msgid "Error in SDLNet_AddSocket(): "
-msgstr ""
-
-#: src/net/ea/network.cpp:393
-msgid "Error: SDLNet_CheckSockets"
-msgstr ""
-
-#: src/net/ea/network.cpp:407
-msgid "Disconnected."
+msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:411
+#: src/net/ea/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/network.cpp:438
-msgid "Error in SDLNet_TCP_Recv(), "
-msgstr ""
-
-#: src/net/ea/network.cpp:439
-msgid " sockets are ready: "
-msgstr ""
-
-#: src/net/ea/network.cpp:447
-#, c-format
-msgid "Error in SDLNet_DelSocket(): %s"
-msgstr ""
-
-#: src/net/ea/network.cpp:460
-#, c-format
-msgid "Network error: %s"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:78
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:128
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:185
-#, c-format
-msgid "Unknown party exp option: %d\n"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:208
-#, c-format
-msgid "Unknown party item option: %d\n"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:268
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:269
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:271
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:272
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:273
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
@@ -5057,39 +3022,39 @@ msgstr ""
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:274
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:276
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:278
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:279
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:280
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:281
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:282
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:283
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
@@ -5148,48 +3113,28 @@ msgstr ""
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:184
-#, c-format
-msgid "Warping to %s (%d, %d)"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:214
-#, c-format
-msgid "Adjust scrolling by %d:%d"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:242 src/net/ea/playerhandler.cpp:303
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:243
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:324
+#: src/net/ea/playerhandler.cpp:333
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:360
+#: src/net/ea/playerhandler.cpp:369
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:521
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:525
-#, c-format
-msgid "0x013b: Unhandled message %i"
-msgstr ""
-
-#: src/net/ea/specialhandler.cpp:138
-#, c-format
-msgid "Action: %d/%d"
-msgstr ""
-
 #: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
@@ -5270,149 +3215,132 @@ msgstr ""
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:117
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:118
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:150
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:157
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:288
+#: src/net/manaserv/beinghandler.cpp:324
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:289
+#: src/net/manaserv/beinghandler.cpp:325
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:108
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:118 src/net/manaserv/charhandler.cpp:196
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:121
-msgid "Selection out of range."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
+#: src/net/manaserv/charhandler.cpp:131
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:202
+#: src/net/manaserv/charhandler.cpp:134
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:205
+#: src/net/manaserv/charhandler.cpp:137
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:208
+#: src/net/manaserv/charhandler.cpp:140
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:211
+#: src/net/manaserv/charhandler.cpp:143
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:214
+#: src/net/manaserv/charhandler.cpp:146
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:217
+#: src/net/manaserv/charhandler.cpp:149
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:220
+#: src/net/manaserv/charhandler.cpp:152
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:223
+#: src/net/manaserv/charhandler.cpp:155
 msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:260
-#, c-format
-msgid "Game server: %s:%d"
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:262
+#: src/net/manaserv/charhandler.cpp:199
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:202
 #, c-format
-msgid "Chat server: %s:%d"
+msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:291
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:314
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:132
-msgid "Chatserver: Not logged in"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:135
-msgid "Chatserver: Unknown error"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:165
-msgid "Unknown : "
-msgstr ""
-
 #: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:265
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
@@ -5421,10 +3349,6 @@ msgstr ""
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:193 src/net/manaserv/chathandler.cpp:273
-msgid "@"
-msgstr ""
-
 #: src/net/manaserv/chathandler.cpp:201
 msgid "Error joining channel."
 msgstr ""
@@ -5433,10 +3357,6 @@ msgstr ""
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:215
-msgid " - "
-msgstr ""
-
 #: src/net/manaserv/chathandler.cpp:219
 msgid "End of channel list."
 msgstr ""
@@ -5465,237 +3385,114 @@ msgstr ""
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:102
-msgid "will"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:102
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:174
+#: src/net/manaserv/generalhandler.cpp:171
 msgid "Willpower"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:76
-msgid "Received CPMSG_GUILD_CREATE_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:80
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:85
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:91
-msgid "Received CPMSG_GUILD_INVITE_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:95
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:101
-msgid "Received CPMSG_GUILD_ACCEPT_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:111
-msgid "Received CPMSG_GUILD_GET_MEMBERS_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:145
-msgid "Received CPMSG_GUILD_UPDATE_LIST"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:183
-msgid "Invalid guild event"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:193
-msgid "Received CPMSG_GUILD_INVITED"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:204
-msgid "Received CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:209
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:214
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:220
-msgid "Received CPMSG_GUILD_REJOIN"
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:227
-msgid "Received CPMSG_GUILD_QUIT_RESPONSE"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:83
+#: src/net/manaserv/loginhandler.cpp:87
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:260
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:263
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
 msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:113
+#: src/net/manaserv/loginhandler.cpp:118
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:119 src/net/manaserv/loginhandler.cpp:149
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
+#: src/net/manaserv/loginhandler.cpp:149
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:152
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: src/net/manaserv/loginhandler.cpp:158
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176
-msgid "Accountserver: Not logged in"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:179 src/net/manaserv/loginhandler.cpp:203
-msgid "Accountserver: Unknown error"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:200
-msgid "Accountserver: Wrong username or password"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:222
-#, c-format
-msgid "%s: %s\n"
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:231
+#: src/net/manaserv/loginhandler.cpp:239
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:254 src/net/manaserv/loginhandler.cpp:290
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:257
+#: src/net/manaserv/loginhandler.cpp:266
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: src/net/manaserv/loginhandler.cpp:275
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:293
+#: src/net/manaserv/loginhandler.cpp:303
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:296
+#: src/net/manaserv/loginhandler.cpp:306
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:299
+#: src/net/manaserv/loginhandler.cpp:309
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:302
+#: src/net/manaserv/loginhandler.cpp:312
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:120
+#: src/net/manaserv/partyhandler.cpp:123
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/playerhandler.cpp:132
-#, c-format
-msgid "Changing server to %s:%d"
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:137
-msgid "ATTRIBUTE UPDATE:"
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:143
-#, c-format
-msgid "%d set to %d %d"
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:160
-msgid "EXP Update"
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:183
-msgid "Level Progress Update"
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:200
-#, c-format
-msgid "Warning: Server denied increase of attribute %d (unknown attribute) "
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:207
-#, c-format
-msgid "Warning: Server denied increase of attribute %d (no points left) "
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:215
-#, c-format
-msgid "Warning: Server denied increase of attribute %d (reason unknown) "
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:236
-#, c-format
-msgid "Warning: Server denied reduction of attribute %d (unknown attribute) "
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:243
-#, c-format
-msgid "Warning: Server denied reduction of attribute %d (no points left) "
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:252
-#, c-format
-msgid "Warning: Server denied reduction of attribute %d (reason unknown) "
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:303
-#, c-format
-msgid "Changing map to %s (%d, %d)"
-msgstr ""
-
-#: src/net/manaserv/playerhandler.cpp:326
-#, c-format
-msgid "Adjust scrolling by %d,%d"
-msgstr ""
-
 #: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
@@ -5704,388 +3501,56 @@ msgstr ""
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:136
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/playerrelations.cpp:34
-msgid "nop"
-msgstr ""
-
-#: src/playerrelations.cpp:35
-msgid "emote0"
-msgstr ""
-
-#: src/playerrelations.cpp:39
-msgid "relation"
-msgstr ""
-
-#: src/playerrelations.cpp:111
-msgid "persistent-player-list"
-msgstr ""
-
-#: src/playerrelations.cpp:112
-msgid "player-ignore-strategy"
-msgstr ""
-
-#: src/playerrelations.cpp:113
-msgid "default-player-permissions"
-msgstr ""
-
-#: src/playerrelations.cpp:138 src/playerrelations.cpp:155
-msgid "player"
-msgstr ""
-
-#: src/playerrelations.cpp:296
+#: src/playerrelations.cpp:304
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:310
+#: src/playerrelations.cpp:318
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:311
-msgid "dotdotdot"
-msgstr ""
-
-#: src/playerrelations.cpp:316
-msgid "..."
-msgstr ""
-
-#: src/playerrelations.cpp:326
+#: src/playerrelations.cpp:334
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:327
-msgid "blinkname"
-msgstr ""
-
-#: src/playerrelations.cpp:363
+#: src/playerrelations.cpp:371
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:366
+#: src/playerrelations.cpp:374
 msgid "Floating bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:367
-msgid "emote1"
-msgstr ""
-
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
 #: src/resources/itemdb.cpp:53
-msgid "defense"
-msgstr ""
-
-#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
 #: src/resources/itemdb.cpp:54
-msgid "hp"
-msgstr ""
-
-#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
 #: src/resources/itemdb.cpp:55
-msgid "mp"
-msgstr ""
-
-#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
-msgid "generic"
-msgstr ""
-
-#: src/resources/itemdb.cpp:68
-msgid "usable"
-msgstr ""
-
-#: src/resources/itemdb.cpp:69
-msgid "equip-1hand"
-msgstr ""
-
-#: src/resources/itemdb.cpp:70
-msgid "equip-2hand"
-msgstr ""
-
-#: src/resources/itemdb.cpp:71
-msgid "equip-torso"
-msgstr ""
-
-#: src/resources/itemdb.cpp:72
-msgid "equip-arms"
-msgstr ""
-
-#: src/resources/itemdb.cpp:73
-msgid "equip-head"
-msgstr ""
-
-#: src/resources/itemdb.cpp:74
-msgid "equip-legs"
-msgstr ""
-
-#: src/resources/itemdb.cpp:75
-msgid "equip-shield"
-msgstr ""
-
-#: src/resources/itemdb.cpp:76
-msgid "equip-ring"
-msgstr ""
-
-#: src/resources/itemdb.cpp:77
-msgid "equip-necklace"
-msgstr ""
-
-#: src/resources/itemdb.cpp:78
-msgid "equip-feet"
-msgstr ""
-
-#: src/resources/itemdb.cpp:79
-msgid "equip-ammo"
-msgstr ""
-
-#: src/resources/itemdb.cpp:85
-msgid "knife"
-msgstr ""
-
-#: src/resources/itemdb.cpp:86
-msgid "sword"
-msgstr ""
-
-#: src/resources/itemdb.cpp:87
-msgid "polearm"
-msgstr ""
-
-#: src/resources/itemdb.cpp:88
-msgid "staff"
-msgstr ""
-
-#: src/resources/itemdb.cpp:89
-msgid "whip"
-msgstr ""
-
-#: src/resources/itemdb.cpp:90
-msgid "bow"
-msgstr ""
-
-#: src/resources/itemdb.cpp:91
-msgid "shooting"
-msgstr ""
-
-#: src/resources/itemdb.cpp:92
-msgid "mace"
-msgstr ""
-
-#: src/resources/itemdb.cpp:93
-msgid "axe"
-msgstr ""
-
-#: src/resources/itemdb.cpp:94
-msgid "thrown"
-msgstr ""
-
-#: src/resources/itemdb.cpp:110
-msgid "Initializing item database..."
-msgstr ""
-
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:121
-msgid "items"
-msgstr ""
-
-#: src/resources/itemdb.cpp:123
-msgid "ItemDB: Error while loading items.xml!"
-msgstr ""
-
-#: src/resources/itemdb.cpp:135
-msgid "ItemDB: Invalid or missing item ID in items.xml!"
-msgstr ""
-
-#: src/resources/itemdb.cpp:140
-#, c-format
-msgid "ItemDB: Redefinition of item ID %d"
-msgstr ""
-
-#: src/resources/itemdb.cpp:143
-msgid "other"
-msgstr ""
-
-#: src/resources/itemdb.cpp:144
-msgid "weight"
-msgstr ""
-
-#: src/resources/itemdb.cpp:145
-msgid "view"
-msgstr ""
-
-#: src/resources/itemdb.cpp:148
-msgid "image"
-msgstr ""
-
-#: src/resources/itemdb.cpp:150
-msgid "weapon-type"
-msgstr ""
-
-#: src/resources/itemdb.cpp:151
-msgid "attack-range"
-msgstr ""
-
-#: src/resources/itemdb.cpp:156 src/resources/monsterdb.cpp:45
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
 #: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
-
-#: src/resources/itemdb.cpp:180
-msgid "effect"
-msgstr ""
-
-#: src/resources/itemdb.cpp:188 src/resources/monsterdb.cpp:94
-msgid "sprite"
-msgstr ""
-
-#: src/resources/itemdb.cpp:191 src/resources/monsterdb.cpp:133
-msgid "particle-effect"
-msgstr ""
-
-#: src/resources/itemdb.cpp:214
-#, c-format
-msgid "ItemDB: Duplicate name of item found item %d"
-msgstr ""
-
-#: src/resources/itemdb.cpp:220
-#, c-format
-msgid "ItemDB: Missing attack range from weapon %i!"
-msgstr ""
-
-#: src/resources/itemdb.cpp:224
-msgid "ItemDB: Missing "
-msgstr ""
-
-#: src/resources/itemdb.cpp:224
-#, c-format
-msgid " attribute for item %i!"
-msgstr ""
-
-#: src/resources/itemdb.cpp:245
-msgid "Unloading item database..."
-msgstr ""
-
-#: src/resources/itemdb.cpp:263
-#, c-format
-msgid "ItemDB: Warning, unknown item ID# %d"
-msgstr ""
-
-#: src/resources/itemdb.cpp:280
-#, c-format
-msgid "ItemDB: Warning, unknown item name \"%s\""
-msgstr ""
-
-#: src/resources/itemdb.cpp:291 src/resources/itemdb.cpp:294
-#: src/resources/itemdb.cpp:298
-msgid "unisex"
-msgstr ""
-
-#: src/resources/itemdb.cpp:294
-msgid "male"
-msgstr ""
-
-#: src/resources/itemdb.cpp:298
-msgid "female"
-msgstr ""
-
-#: src/resources/itemdb.cpp:306 src/resources/monsterdb.cpp:101
-msgid "event"
-msgstr ""
-
-#: src/resources/itemdb.cpp:309 src/resources/monsterdb.cpp:105
-msgid "hit"
-msgstr ""
-
-#: src/resources/itemdb.cpp:313
-msgid "strike"
-msgstr ""
-
-#: src/resources/itemdb.cpp:319
-#, c-format
-msgid "ItemDB: Ignoring unknown sound event '%s'"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:47
-msgid "Initializing monster database..."
-msgstr ""
-
-#: src/resources/monsterdb.cpp:52
-msgid "monsters"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:54
-msgid "Monster Database: Error while loading monster.xml!"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:60
-msgid "monster"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:70
-msgid "targetCursor"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:71
-msgid "small"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:79
-msgid "large"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:85
-#, c-format
-msgid ""
-"MonsterDB: Unknown target cursor type \"%s\" for %s -using medium sized one"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:109
-msgid "miss"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:113
-msgid "hurt"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:117
-msgid "die"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:123
-#, c-format
-msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:135
-msgid "action"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:138
-msgid "particlefx"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:165
-#, c-format
-msgid "MonsterDB: Warning, unknown monster ID %d requested"
-msgstr ""
diff --git a/po/nds.po b/po/nds.po
index 5406aae9..d32ce2c9 100644
--- a/po/nds.po
+++ b/po/nds.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-04-21 17:27+0200\n"
+"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-03-05 21:33+0100\n"
 "PO-Revision-Date: 2009-04-21 16:38+0000\n"
 "Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
 "Language-Team: German, Low <nds@li.org>\n"
@@ -17,897 +17,945 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: 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 "Beenden"
-
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:39
-msgid "Buy"
-msgstr "kaufen"
-
-#: 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 "Beschreibung: %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 "Wirkung: %s"
-
-#: src/gui/buysell.cpp:39 src/gui/sell.cpp:46 src/gui/sell.cpp:72
-msgid "Sell"
-msgstr "Verkaufen"
-
-#: 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 "Abbrechen"
-
-#: src/gui/changeemaildialog.cpp:42 src/gui/changeemaildialog.cpp:51
-#: src/gui/char_select.cpp:122
-msgid "Change Email Address"
-msgstr "Email-Adresse ändern"
-
-#: src/gui/changeemaildialog.cpp:46 src/gui/changepassworddialog.cpp:47
-#: src/gui/char_select.cpp:124
-#, c-format
-msgid "Account: %s"
-msgstr "Account: %s"
-
-#: src/gui/changepassworddialog.cpp:43 src/gui/changepassworddialog.cpp:54
-#: src/gui/char_select.cpp:121
-msgid "Change Password"
-msgstr "Passwort ändern"
-
-#: src/gui/changepassworddialog.cpp:49 src/gui/login.cpp:51
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:49
-msgid "Password:"
-msgstr "Passwort:"
-
-#: src/gui/charcreatedialog.cpp:55
-msgid "Create Character"
-msgstr "Charakter erstellen"
-
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:50
-#: src/gui/register.cpp:60
-msgid "Name:"
-msgstr "Name:"
-
-#: src/gui/charcreatedialog.cpp:70
-msgid "Hair Color:"
-msgstr "Haarfarbe:"
-
-#: src/gui/charcreatedialog.cpp:73
-msgid "Hair Style:"
-msgstr "Frisur:"
-
-#: src/gui/charcreatedialog.cpp:74
-msgid "Create"
-msgstr "erstellen"
-
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
-msgid "Male"
-msgstr "männlich"
-
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
-msgid "Female"
-msgstr "weiblich"
-
-#: src/gui/charcreatedialog.cpp:95 src/gui/charcreatedialog.cpp:235
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Bitte verteile %d Punkte"
-
-#: 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 "Fehler"
-
-#: src/gui/charcreatedialog.cpp:174
-msgid "Your name needs to be at least 4 characters."
-msgstr "Dein Name muss aus mindestens 4 Buchstaben bestehen."
-
-#: src/gui/charcreatedialog.cpp:239
-#, c-format
-msgid "Please remove %d points"
-msgstr "Bitte entferne %d Punkte"
-
-#: src/gui/char_select.cpp:79
-msgid "Confirm Character Delete"
-msgstr "Der Löschung des Charakters zustimmen"
-
-#: src/gui/char_select.cpp:80
-msgid "Are you sure you want to delete this character?"
-msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
-
-#: 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 "Ok"
-
-#: 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 "Level: %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 "Neu"
-
-#: 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 "Löschen"
-
-#: src/gui/char_select.cpp:127
-#, c-format
-msgid "Money: %d"
-msgstr "Geld: %d"
-
-#: src/gui/confirm_dialog.cpp:42
-msgid "Yes"
-msgstr "Ja"
-
-#: src/gui/confirm_dialog.cpp:43
-msgid "No"
-msgstr "Nein"
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Setup"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
 msgstr "verbinde..."
 
-#: 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 "Benutzen"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
-msgid "Equipment"
-msgstr "Ausrüstung"
-
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:274
-msgid "Unequip"
-msgstr "Ablegen"
-
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
-msgid "Inventory"
-msgstr "Inventar"
-
-#: src/gui/inventorywindow.cpp:66 src/gui/inventorywindow.cpp:68
-#: src/gui/inventorywindow.cpp:277
-msgid "Equip"
-msgstr "Ausrüsten"
-
-#: src/gui/inventorywindow.cpp:77
-msgid "Drop"
-msgstr "Ablegen"
-
-#: src/gui/login.cpp:47
-msgid "Login"
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
 msgstr "Login"
 
-#: src/gui/login.cpp:53 src/gui/register.cpp:64 src/gui/serverdialog.cpp:75
-#: src/gui/widgets/chattab.cpp:136
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:54 src/gui/register.cpp:65 src/gui/serverdialog.cpp:76
-msgid "Port:"
-msgstr "Port:"
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
 
-#: src/gui/login.cpp:75 src/gui/register.cpp:56 src/gui/register.cpp:80
-msgid "Register"
-msgstr "Registrieren"
+#: src/client.cpp:739
+msgid "Requesting characters"
+msgstr ""
 
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
 
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Fähigkeiten"
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Fehler"
 
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Setup"
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
 
-#: src/gui/quitdialog.cpp:37
-msgid "Switch server"
-msgstr "Server wechseln"
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Passwort:"
 
-#: src/gui/quitdialog.cpp:38
-msgid "Switch character"
-msgstr "Charakter wechseln"
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
 
-#: src/gui/register.cpp:62
-msgid "Confirm:"
-msgstr "Bestätigen:"
+#: src/client.cpp:862
+msgid "Email Change"
+msgstr ""
 
-#: src/gui/register.cpp:67
-msgid "Email:"
-msgstr "Email:"
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
 
-#: src/gui/register.cpp:170
-#, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Der Username muss mindestens %d Buchstaben beinhalten."
+#: src/client.cpp:883
+msgid "Unregister Successful"
+msgstr ""
 
-#: src/gui/register.cpp:178
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Der Username muss weniger als %d Buchstaben beinhalten."
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/client.cpp:1007 src/client.cpp:1030
 #, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Das Passwort muss mindestens %d Buchstaben beinhalten."
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/client.cpp:1119
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Das Passwort muss weniger als %d Buchstaben beinhalten."
-
-#: src/gui/register.cpp:201
-msgid "Passwords do not match."
-msgstr "Die Passwörter stimmen nicht überein."
-
-#: src/gui/setup_audio.cpp:41
-msgid "Sound"
-msgstr "Sound"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Sfx Lautstärke"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Musiklautstärke"
-
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Zustimmen"
-
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "einstellen"
-
-#: src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Joystick einschalten"
-
-#: src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stop"
-
-#: src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Tastatur"
-
-#: src/gui/setup_video.cpp:247 src/gui/setup_video.cpp:538
-msgid "off"
-msgstr "aus"
-
-#: 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 "niedrig"
-
-#: 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 "hoch"
-
-#: src/gui/trade.cpp:74
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: src/gui/trade.cpp:97
-msgid "You give:"
-msgstr "Du gibst:"
-
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
-msgid "Strength:"
-msgstr "Stärke"
+msgid "Invalid update host: %s"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
-msgid "Intelligence:"
-msgstr "Intelligenz"
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
-msgid "Willpower:"
-msgstr "Willenskraft"
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+msgid "Unknown command."
+msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
-msgid "/help > Display this help."
+#: src/commandhandler.cpp:157
+msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
-msgid "For more information, type /help <command>"
+#: src/commandhandler.cpp:188
+msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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:77
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:76
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:273
-msgid "Unknown command."
-msgstr ""
-
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: src/commandhandler.cpp:375
+msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:383
 #, 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:397
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:398
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
+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:172
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:411
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:416
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:705
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:672
-msgid "no"
+#: src/game.cpp:712
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:813
-msgid "Ignoring incoming trade requests"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:820
-msgid "Accepting incoming trade requests"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr ""
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "kaufen"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:277
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
+
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
 msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:48
-msgid "Type New Email Address twice:"
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Verkaufen"
+
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Email-Adresse ändern"
+
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Account: %s"
+
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:51
-msgid "Type New Password twice:"
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Der Username muss mindestens %d Buchstaben beinhalten."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Der Username muss weniger als %d Buchstaben beinhalten."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:227
-msgid "Character stats OK"
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Passwort:"
+
+#: src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/char_select.cpp:98
-msgid "Account and Character Management"
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Das Passwort muss mindestens %d Buchstaben beinhalten."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Das Passwort muss weniger als %d Buchstaben beinhalten."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/char_select.cpp:105
-msgid "Select Character"
+#: src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Charakter erstellen"
+
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Name:"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
 msgstr ""
 
-#: src/gui/char_select.cpp:113
-msgid "Previous"
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
 msgstr ""
 
-#: src/gui/char_select.cpp:114 src/gui/npc_text.cpp:88
-msgid "Next"
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
+msgstr "Haarfarbe:"
+
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
+msgstr "Frisur:"
+
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
+msgid "Create"
+msgstr "erstellen"
+
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+msgid "Male"
+msgstr "männlich"
+
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+msgid "Female"
+msgstr "weiblich"
+
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Bitte verteile %d Punkte"
+
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
+msgstr "Dein Name muss aus mindestens 4 Buchstaben bestehen."
+
+#: src/gui/charcreatedialog.cpp:242
+msgid "Character stats OK"
 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/charcreatedialog.cpp:256
 #, c-format
-msgid "Name: %s"
+msgid "Please remove %d points"
+msgstr "Bitte entferne %d Punkte"
+
+#: src/gui/charselectdialog.cpp:69
+msgid "Confirm Character Delete"
+msgstr "Der Löschung des Charakters zustimmen"
+
+#: src/gui/charselectdialog.cpp:70
+msgid "Are you sure you want to delete this character?"
+msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
+
+#: src/gui/charselectdialog.cpp:117
+msgid "Account and Character Management"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/char_select.cpp:162 src/gui/char_select.cpp:306
-#: src/gui/char_select.cpp:326
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Email-Adresse ändern"
+
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
+msgid "Delete"
+msgstr "Löschen"
+
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 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
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:72 src/gui/menuwindow.cpp:65 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
-msgid "Present: "
+#: src/gui/chat.cpp:287
+#, c-format
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:451
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/emotecontainer.cpp:61
-msgid "Unable to load selection.png"
+#: src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Ja"
+
+#: src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nein"
+
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
 msgstr ""
 
-#: src/gui/emotewindow.cpp:37 src/gui/menuwindow.cpp:76
-msgid "Emote"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Account: %s"
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Ausrüstung"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Ablegen"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npc_text.cpp:95
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+msgid "Inventory"
+msgstr "Inventar"
+
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+msgid "Equip"
+msgstr "Ausrüsten"
+
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+msgid "Use"
+msgstr "Benutzen"
+
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
+msgstr "Ablegen"
+
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/item_amount.cpp:68
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Ablegen"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/item_amount.cpp:92
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:89
-msgid "Weight: "
-msgstr ""
-
-#: src/gui/login.cpp:55
-msgid "Recent:"
-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/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Wirkung: %s"
 
-#: src/gui/magic.cpp:32 src/gui/menuwindow.cpp:71 src/gui/skilldialog.cpp:117
-#: src/localplayer.cpp:860
-msgid "Magic"
-msgstr ""
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
+msgid "Login"
+msgstr "Login"
 
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registrieren"
 
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Server:"
 
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+msgid "Map"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:73
-msgid "Buddys"
+#: src/gui/npcdialog.cpp:44
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
+#: src/gui/npcdialog.cpp:45
+msgid "Next"
 msgstr ""
 
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr ""
+#: src/gui/npcdialog.cpp:47
+#, fuzzy
+msgid "Submit"
+msgstr "Beenden"
 
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+msgid "NPC"
 msgstr ""
 
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
 msgid ""
 "\n"
-"> Cancel\n"
+"> Next\n"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
+#: src/gui/npcpostdialog.cpp:47
+msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
+#: src/gui/npcpostdialog.cpp:96
+msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/npc_text.cpp:53 src/gui/npc_text.cpp:119
-msgid "Waiting for server"
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:233
-#: src/gui/setup_video.cpp:495
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Ablegen"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -923,271 +971,298 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:38
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Server"
-msgstr ""
-
-#: src/gui/palette.cpp:100
-msgid "Logger"
-msgstr ""
-
-#: src/gui/palette.cpp:101
-msgid "Hyperlink"
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
 msgstr ""
 
 #: src/gui/palette.cpp:103
-msgid "Being"
+msgid "Server"
 msgstr ""
 
 #: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Logger"
 msgstr ""
 
 #: src/gui/palette.cpp:105
-msgid "Own Name"
-msgstr ""
-
-#: src/gui/palette.cpp:106
-msgid "GM Names"
+msgid "Hyperlink"
 msgstr ""
 
 #: src/gui/palette.cpp:107
-msgid "NPCs"
+msgid "Being"
 msgstr ""
 
 #: src/gui/palette.cpp:108
-msgid "Monsters"
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/palette.cpp:109
+msgid "Own Name"
 msgstr ""
 
 #: src/gui/palette.cpp:110
-msgid "Unknown Item Type"
+msgid "GM Names"
 msgstr ""
 
 #: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "NPCs"
 msgstr ""
 
 #: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
-
-#: src/gui/palette.cpp:113
-msgid "Usable"
+msgid "Monsters"
 msgstr ""
 
 #: src/gui/palette.cpp:114
-msgid "Shirt"
+msgid "Unknown Item Type"
 msgstr ""
 
 #: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+msgid "Generics"
 msgstr ""
 
 #: src/gui/palette.cpp:116
-msgid "Pants"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Status"
 
 #: src/gui/palette.cpp:117
-msgid "Shoes"
-msgstr ""
+#, fuzzy
+msgid "Usables"
+msgstr "Benutzen"
 
 #: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+msgid "Shirts"
 msgstr ""
 
 #: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "One Handed Weapons"
 msgstr ""
 
 #: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Pants"
 msgstr ""
 
 #: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Shoes"
 msgstr ""
 
 #: src/gui/palette.cpp:122
-msgid "Arms"
+msgid "Two Handed Weapons"
 msgstr ""
 
 #: src/gui/palette.cpp:123
-msgid "Ammo"
+#, fuzzy
+msgid "Shields"
+msgstr "Fähigkeiten"
+
+#: src/gui/palette.cpp:124
+msgid "Rings"
 msgstr ""
 
 #: src/gui/palette.cpp:125
-msgid "Particle Effects"
+msgid "Necklaces"
 msgstr ""
 
 #: src/gui/palette.cpp:126
-msgid "Pickup Notification"
+msgid "Arms"
 msgstr ""
 
 #: src/gui/palette.cpp:127
-msgid "Exp Notification"
+msgid "Ammo"
 msgstr ""
 
 #: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/palette.cpp:130
+msgid "Pickup Notification"
 msgstr ""
 
 #: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:73
-msgid "@@name|Add name to chat@@"
+#: src/gui/popupmenu.cpp:84
+#, c-format
+msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, c-format
-msgid "@@trade|Trade With %s@@"
+msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:86 src/gui/popupmenu.cpp:128
+#: src/gui/popupmenu.cpp:92
 #, c-format
-msgid "@@attack|Attack %s@@"
+msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:95
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:111
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:354
-msgid "@@cancel|Cancel@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@pickup|Pick Up %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:339
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:191
+#, c-format
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:345
-msgid "@@use|Use@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:347
-msgid "@@drop|Drop@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:350
-msgid "@@split|Split@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
+#: src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Server wechseln"
+
+#: src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Charakter wechseln"
+
 #: src/gui/recorder.cpp:87
 msgid "Finishing recording."
 msgstr ""
@@ -1204,34 +1279,126 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:73
-msgid "Choose your server"
+#: src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Bestätigen:"
+
+#: src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
+
+#: src/gui/register.cpp:166
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Der Username muss mindestens %d Buchstaben beinhalten."
+
+#: src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Der Username muss weniger als %d Buchstaben beinhalten."
+
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "Das Passwort muss mindestens %d Buchstaben beinhalten."
+
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Das Passwort muss weniger als %d Buchstaben beinhalten."
+
+#: src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Die Passwörter stimmen nicht überein."
+
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "verbinde..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:50
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Sound"
+
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Sfx Lautstärke"
+
+#: src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Musiklautstärke"
+
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
@@ -1240,46 +1407,50 @@ msgstr ""
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 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:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 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:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 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:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:109
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:125
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:141
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Zustimmen"
+
+#: src/gui/setup.cpp:51
 msgid "Reset Windows"
 msgstr ""
 
@@ -1287,14 +1458,30 @@ msgstr ""
 msgid "Press the button to start calibration"
 msgstr ""
 
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "einstellen"
+
+#: src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Joystick einschalten"
+
 #: src/gui/setup_joystick.cpp:41
 msgid "Joystick"
 msgstr ""
 
+#: src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stop"
+
 #: src/gui/setup_joystick.cpp:84
 msgid "Rotate the stick"
 msgstr ""
 
+#: src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Tastatur"
+
 #: src/gui/setup_keyboard.cpp:86
 msgid "Assign"
 msgstr ""
@@ -1307,42 +1494,34 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
 #: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
@@ -1356,293 +1535,471 @@ msgid "Put all whispers in tabs"
 msgstr ""
 
 #: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:113
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Small"
+msgstr "Verkaufen"
+
+#: src/gui/setup_video.cpp:115
+msgid "Medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:116
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:142
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:145
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:157
+msgid "off"
+msgstr "aus"
+
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+msgid "low"
+msgstr "niedrig"
+
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+msgid "high"
+msgstr "hoch"
+
+#: src/gui/setup_video.cpp:172
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:174
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:124
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:125
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:128
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:129
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:130
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:131
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:136
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:158
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:159
-msgid "Scroll radius"
+#: src/gui/setup_video.cpp:235
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:160
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:161
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:237
+msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:162
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Nein"
+
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:230 src/gui/setup_video.cpp:492
-msgid "No text"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:239 src/gui/setup_video.cpp:501
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:399
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:558
-msgid "medium"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:270 src/gui/setup_video.cpp:564
-msgid "max"
+#: src/gui/setup_video.cpp:412
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:340
-msgid "Failed to switch to "
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:341
-msgid "windowed"
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
+msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:341
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:342
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:351
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/setup_video.cpp:352
-msgid "Restart needed for changes to take effect."
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+msgid "Skills"
+msgstr "Fähigkeiten"
+
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
 msgstr ""
 
-#: src/gui/setup_video.cpp:364
-msgid "Changing OpenGL"
+#: src/gui/skilldialog.cpp:262
+#, c-format
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/setup_video.cpp:365
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/setup_video.cpp:448
-msgid "Screen resolution changed"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Fähigkeiten"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Level: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Level: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/setup_video.cpp:449
-msgid "Restart your client for the change to take effect."
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/setup_video.cpp:473
-msgid "Particle effect settings changed."
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/setup_video.cpp:474
-msgid "Changes will take effect on map change."
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/skill.cpp:41
-msgid "skills.xml"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/skill.cpp:50
-msgid "Mystery Skill"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
+#: src/gui/socialwindow.cpp:189
 #, c-format
-msgid "Skill points: %d"
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/skill.cpp:146
-msgid "Up"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/skill.cpp:146
-msgid "inc"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/skill.cpp:147
-msgid "use"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Bist du dir sicher, dass du diesen Charakter löschen möchtest?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Charakter erstellen"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:394
 #, c-format
-msgid "Job: %d"
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:61
-msgid "HP:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:64
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:67
-msgid "MP:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:70
-msgid "Job:"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Stats"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Total"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:80
-msgid "Cost"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/status.cpp:87
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:89
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/status.cpp:91
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:93
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Strength"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Agility"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/status.cpp:204
-msgid "Luck"
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
 msgstr ""
 
-#: src/gui/status.cpp:222
+#: src/gui/specialswindow.cpp:174
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "Specials Set %d"
 msgstr ""
 
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
-msgid "Max level"
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:53
-msgid "Storage"
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:64
-msgid "Store"
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Retrieve"
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:75
-msgid "Slots: "
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Geld: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Level: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
 #: src/gui/trade.cpp:52
@@ -1665,57 +2022,67 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:96 src/gui/trade.cpp:132 src/gui/trade.cpp:178
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:77
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Du gibst:"
+
+#: src/gui/trade.cpp:100
+msgid "You give:"
+msgstr "Du gibst:"
+
+#: src/gui/trade.cpp:104
 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:275
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:321
-msgid "You don't have enough money"
+#: src/gui/trade.cpp:318
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "verbinde..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1767,93 +2134,128 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
-msgid "Unknown item"
+#: src/gui/widgets/whispertab.cpp:51
+msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
-msgid "Cannot send empty chat!"
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:61
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
+#: src/keyboardconfig.cpp:45
+msgid "Target & Attack"
+msgstr ""
+
 #: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
@@ -1867,7 +2269,7 @@ msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
-msgid "Target Closest"
+msgid "Target Monster"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
@@ -1925,8 +2327,9 @@ msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:73
-msgid "Equipment WIndow"
-msgstr ""
+#, fuzzy
+msgid "Equipment Window"
+msgstr "Ausrüstung"
 
 #: src/keyboardconfig.cpp:74
 msgid "Skill Window"
@@ -1953,904 +2356,1238 @@ msgid "Debug Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
-msgid "Emote Window"
+msgid "Social Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:81
 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:82
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
+#: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:849
-msgid "Unarmed"
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:850
-msgid "Knife"
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/localplayer.cpp:851
-msgid "Sword"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/localplayer.cpp:852
-msgid "Polearm"
+#: src/main.cpp:44
+msgid "Options:"
 msgstr ""
 
-#: src/localplayer.cpp:853
-msgid "Staff"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/localplayer.cpp:854
-msgid "Whip"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/localplayer.cpp:855
-msgid "Bow"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/localplayer.cpp:856
-msgid "Shooting"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/localplayer.cpp:857
-msgid "Mace"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/localplayer.cpp:858
-msgid "Axe"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/localplayer.cpp:859
-msgid "Thrown"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/localplayer.cpp:861
-msgid "Craft"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/localplayer.cpp:862
-msgid "Unknown Skill"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:253
-msgid "Invalid update host: "
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:286 src/main.cpp:292
-msgid "Error creating updates directory!"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:325
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:481
-msgid "Couldn't set "
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:482
-msgid " video mode: "
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:562
-msgid "mana"
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:563
-msgid "Options: "
+#: src/net/ea/adminhandler.cpp:63
+msgid "Kick failed!"
 msgstr ""
 
-#: src/main.cpp:564
-msgid "  -C --configfile : Configuration file to use"
+#: src/net/ea/adminhandler.cpp:65
+msgid "Kick succeeded!"
 msgstr ""
 
-#: src/main.cpp:565
-msgid "  -d --data       : Directory to load game data from"
+#: src/net/ea/buysellhandler.cpp:110
+msgid "Nothing to sell."
 msgstr ""
 
-#: src/main.cpp:566
-msgid "  -D --default    : Bypass the login process with default settings"
+#: src/net/ea/buysellhandler.cpp:117
+msgid "Thanks for buying."
 msgstr ""
 
-#: src/main.cpp:568
-msgid "  -h --help       : Display this help"
+#: src/net/ea/buysellhandler.cpp:124
+msgid "Unable to buy."
 msgstr ""
 
-#: src/main.cpp:569
-msgid "  -S --homedir    : Directory to use as home directory"
+#: src/net/ea/buysellhandler.cpp:130
+msgid "Thanks for selling."
 msgstr ""
 
-#: src/main.cpp:570
-msgid "  -H --updatehost : Use this update host"
+#: src/net/ea/buysellhandler.cpp:132
+msgid "Unable to sell."
 msgstr ""
 
-#: src/main.cpp:571
-msgid "  -P --password   : Login with this password"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/main.cpp:572
-msgid "  -c --character  : Login with this character"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/main.cpp:573
-msgid "  -o --port       : Login Server Port"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/main.cpp:574
-msgid "  -s --server     : Login Server name or IP"
+#: src/net/ea/charserverhandler.cpp:135
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/main.cpp:575
-msgid "  -u --skipupdate : Skip the update downloads"
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
+msgid "Info"
 msgstr ""
 
-#: src/main.cpp:576
-msgid "  -U --username   : Login with this username"
+#: src/net/ea/charserverhandler.cpp:147
+#, fuzzy
+msgid "Character deleted."
+msgstr "Der Löschung des Charakters zustimmen"
+
+#: src/net/ea/charserverhandler.cpp:152
+msgid "Failed to delete character."
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -v --version    : Display the version"
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+msgid "Strength:"
+msgstr "Stärke"
+
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+msgid "Agility:"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "The Mana World "
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+msgid "Vitality:"
 msgstr ""
 
-#: src/main.cpp:1499
-msgid "Connecting to map server..."
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+msgid "Intelligence:"
+msgstr "Intelligenz"
+
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+msgid "Dexterity:"
 msgstr ""
 
-#: src/main.cpp:1507
-msgid "Connecting to character server..."
+#: src/net/ea/charserverhandler.cpp:242
+msgid "Luck:"
 msgstr ""
 
-#: src/main.cpp:1515
-msgid "Connecting to account server..."
+#: src/net/ea/chathandler.cpp:80
+msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:67
-msgid "Kick failed!"
+#: src/net/ea/chathandler.cpp:84
+msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:69
-msgid "Kick succeeded!"
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
-msgid "Nothing to sell"
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
-msgid "Thanks for buying"
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
-msgid "Unable to buy"
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Name:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Thanks for selling"
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Stärke"
+
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#, c-format
+msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
-msgid "Unable to sell"
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#, c-format
+msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligenz"
+
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#, c-format
+msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Info"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Player deleted"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:140
-msgid "Failed to delete character."
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
-msgid "Agility:"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
-msgid "Vitality:"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
-msgid "Dexterity:"
+#: src/net/ea/generalhandler.cpp:205
+msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:229
-msgid "Luck:"
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:81
-msgid "Whisper could not be sent, user is offline"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 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
-msgid "Channels are not supported!"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:90 src/net/manaserv/generalhandler.cpp:80
-#, c-format
-msgid "Strength: %d"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Löschen"
+
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:82
-#, c-format
-msgid "Agility: %d"
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:227
 #, c-format
-msgid "Vitality: %d"
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:228
 #, c-format
-msgid "Intelligence: %d"
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:229
 #, c-format
-msgid "Dexterity: %d"
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:100
-#, c-format
-msgid "Luck: %d"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:123
-msgid "Authentication failed"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:126
-msgid "No servers available"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:129
-msgid "This account is already logged in"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:132
-msgid "Speed hack detected"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:135
-msgid "Duplicated login"
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:138
-msgid "Unknown connection error"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:197
-msgid "Got disconnected from server!"
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:54
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/new > Alias of create"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:69
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:75
-msgid "Command: /invite <nick>"
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:82
-msgid "Command: /leave"
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:87
 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:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:91
 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:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:97
 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:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:111
-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:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:137 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:140 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 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:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:169 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:172 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:184
-msgid "Unable to pick up item"
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:194
-#, c-format
-msgid "You picked up %s [%s]"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:240
-msgid "Failed to use item"
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:111
-msgid "Unregistered ID"
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:79
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:114
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:149
+msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:117
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "Passwort ändern"
+
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:120
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:124
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"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:165
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
-" Please contact the GM team via the forums."
+"Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:135
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:138
-msgid "Unknown error"
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:229
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:323
+#: src/net/ea/partyhandler.cpp:329
+msgid "Inviting like this isn't supported at the moment."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114
-msgid "Insert coin to continue"
+#: src/net/ea/playerhandler.cpp:105
+msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 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/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 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:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:138
+#: src/net/ea/playerhandler.cpp:129
 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:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:141
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:142
+#: src/net/ea/playerhandler.cpp:133
 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:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:145
+#: src/net/ea/playerhandler.cpp:136
 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:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:301
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:424
-msgid "Equip arrows first"
+#: src/net/ea/playerhandler.cpp:532
+msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:138
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:141
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:144
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:147
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:150
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:153
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:162
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:165
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:168
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:171
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:174
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:180
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:183
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:186
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:189
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:192
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:201
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:204
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:207
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:100
-msgid "Request for trade"
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
+msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:102
-msgid " wants to trade with you, do you accept?"
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:116
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:120
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
-msgid "Trade: You and "
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:136
-msgid "Trade with "
-msgstr ""
-
 #: src/net/ea/tradehandler.cpp:137
-msgid " cancelled"
+#, c-format
+msgid "Trade: You and %s"
 msgstr ""
 
 #: src/net/ea/tradehandler.cpp:144
-msgid "Unhandled trade cancel packet"
+#, c-format
+msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:194
+#: src/net/ea/tradehandler.cpp:153
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:199
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:216
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:223
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Du gibst:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:137
+msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:199
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:151
-msgid "Topic: "
+#: src/net/manaserv/charhandler.cpp:268
+msgid "Willpower:"
+msgstr "Willenskraft"
+
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:90
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
 #, c-format
-msgid "Willpower: %d"
+msgid "%s entered the channel."
 msgstr ""
 
-#: src/resources/itemdb.cpp:53
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Willenskraft"
+
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Willenskraft"
+
+#: src/net/manaserv/guildhandler.cpp:81
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:86
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:96
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:203
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:208
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:106
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:98
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:135
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+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 ""
 
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
-msgid "items.xml"
-msgstr ""
-
-#: src/resources/itemdb.cpp:151
-msgid "Unnamed"
+#: src/resources/itemdb.cpp:114
+msgid "Unknown item"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/monsterdb.cpp:49
-msgid "monsters.xml"
-msgstr ""
+#~ msgid "Description: %s"
+#~ msgstr "Beschreibung: %s"
 
-#: src/resources/npcdb.cpp:53
-msgid "NPC Database: Error while loading npcs.xml!"
-msgstr ""
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "New"
+#~ msgstr "Neu"
diff --git a/po/nl.po b/po/nl.po
index 965f9b97..e5768f42 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
 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-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,578 +17,726 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Configureren"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Verbinden met de map server..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Inloggen"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Kies Personage"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Verbinden met de map server..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Fout"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Wachtwoord:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+msgid "Email Change"
+msgstr ""
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Registreren"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "Commando: /help <commando>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Commando: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Commando: /help <commando>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Commando: /announce <msg>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Commando: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Commando: /announce <msg>"
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Commando: /clear"
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Commando: /announce <msg>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Commando: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Type /help voor een lijst van commando's."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Afsluiten"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
+msgstr "Verbinden met de karakter server..."
+
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Beschrijving: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Effect: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Afsluiten"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Verkopen"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Haarkleur:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Haarstijl:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Mannelijk"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Fout"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "OK"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Vorige"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Volgende"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Naam: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Level: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Registreren"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Nieuw"
+#: src/gui/charselectdialog.cpp:150
+msgid "Change Email"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Registreren"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Geld: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr ""
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Sluiten"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -601,182 +749,224 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Verbinden..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Uitrusting"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Afdoen"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Naam: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Omgevingseffecten"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Uitrusting"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Afdoen"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventaris"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Neerleggen"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Neerleggen"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "OK"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Effect: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Poort:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr ""
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Onthoud Naam"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Server Selecteren"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "Kaartje"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Volgende"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Afsluiten"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Volgende"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Afdoen"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -792,329 +982,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Status"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Gebruiken"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Vaardigheden"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Handelen met %s@@"
 
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "@@attack|%s aanvallen@@"
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Wilskracht:"
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Handelen met %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|%s aanvallen@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Genegeerd"
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: 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:165
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@pickup|%s oppakken@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Uitrusten@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Gebruiken@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Neerleggen@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:372
-#, fuzzy
-msgid "@@store|Store@@"
-msgstr "@@use|Gebruiken@@"
-
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Van server wisselen"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
@@ -1134,137 +1290,183 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Bevestigen:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "E-mail:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Poort:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Verbinden..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Aangepaste cursor"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Server Selecteren"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Configureren"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Toepassen"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Verbinden met de map server..."
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Vensters in beginstand"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
-msgstr ""
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
+msgstr "Spelen"
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Toepassen"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Vensters in beginstand"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
@@ -1305,432 +1507,599 @@ msgstr "Standaard"
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Relatie"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Vriend"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Spelers"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Verkopen"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 #, fuzzy
 msgid "Medium"
 msgstr "gemiddeld"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "uit"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "laag"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "hoog"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "gemiddeld"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Dekking van de GUI"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Nee"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Overgaan naar volledig scherm"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Veranderen van OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Vaardigheden"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Level: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Level: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Totaal"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Kosten"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Personage Aanmaken"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:502
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/trade.cpp:51
-msgid "Propose trade"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Geld: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Attributen van personage OK"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Level: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
 #: src/gui/trade.cpp:52
-msgid "Confirmed. Waiting..."
+msgid "Propose trade"
 msgstr ""
 
 #: src/gui/trade.cpp:53
-msgid "Agree trade"
+msgid "Confirmed. Waiting..."
 msgstr ""
 
 #: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Je geeft:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Naam: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Verbinden..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -1782,1209 +2151,1439 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Status"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Commando: /where"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Sneltoets"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Server Selecteren"
+
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Uitrusting"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
+msgid "Social Window"
 msgstr "Vensters in beginstand"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Uitrusting"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Verbinden met de map server..."
-
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "Verbinden met de karakter server..."
-
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Verbinden met de account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Attributen van personage OK"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Sterkte:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agiliteit:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Spelers"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Naam"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Sterkte:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agiliteit:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitaliteit:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligentie:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexteriteit:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Verwijderen"
+
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Registreren"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
+msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Verbinden met de map server..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Zitten niet mogelijk!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Je geeft:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Attributen van personage OK"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Attributen van personage OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Attributen van personage OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Attributen van personage OK"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Selecteer het aantal exemplaren om te verhandelen"
+
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Wilskracht:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Wilskracht:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Wilskracht:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "Voltooid"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3005,20 +3604,54 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "Naamloos"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Kies Personage"
+#~ msgid "Description: %s"
+#~ msgstr "Beschrijving: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Vorige"
+
+#~ msgid "New"
+#~ msgstr "Nieuw"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuleren@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Uitrusten@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Gebruiken@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Neerleggen@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@use|Gebruiken@@"
+
+#~ msgid "Total"
+#~ msgstr "Totaal"
+
+#~ msgid "Cost"
+#~ msgstr "Kosten"
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Verbinden met de account server..."
+
+#~ msgid "Unnamed"
+#~ msgstr "Naamloos"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Scroll radius"
diff --git a/po/pl.po b/po/pl.po
index b57b8707..2479f412 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@
 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-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-05-30 15:48+0000\n"
 "Last-Translator: lusmanko <Unknown>\n"
 "Language-Team: <pl@li.org>\n"
@@ -19,203 +19,319 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-08 19:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Konfiguracja"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Łączenie z serwerem map..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Użytkownik"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Wybierz postać"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Łączenie z serwerem map..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Błąd"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Hasło:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Zmień"
+
+#: src/client.cpp:863
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "Członek został pomyślnie wypromowany."
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Wyrejestruj"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "Nieprawidłowy host aktualizacji: "
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Pomoc --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Pokazuje tę pomoc"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Wyświetla nazwę mapy"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Wyświetla liczbę podłączonych użytkowników"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Powiedz coś o sobie"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Czyści to okno"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Wysyła prywatną wiadomość do użytkownika"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias  polecenia msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Alias polecenia msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 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:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > Alias polecenia query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Pokaż wszystkie publiczne kanały"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Dołącz lub utwórz kanał"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Utworzenie nowej grupy"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Rozpocznij zapisywanie czatu do zewnętrznego pliku"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Określa czy <return> przełącza dziennik czatu"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 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:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalne ogłoszenie (tylko GM)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr "Aby uzyskać więcej informacji, wpisz /help <komenda>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Komenda: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Ta komenda wyświetla listę dostępnych komend."
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Komenda: /help <komenda>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Komenda: /announce <wiadomość>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** dostępne tylko dla GM ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 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:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Komenda: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "Ta komenda czyści zawartość okna."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Komenda: /item <zasada>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Ta komenda wyświetla liczbę połączonych graczy."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Komenda: /join <kanał>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "Ta komenda powoduje, iż wejdziesz do  <kanał>"
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Jeżeli <kanał> nie istnieje, to zostanie utworzony."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "Komenda: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "Ta komenda pokazuje listę wszystkich kanałów."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "Komenda: /me <wiadomość>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Ta komenda mówi innym co (robisz) <wiadomość>."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "Komenda: /msg <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "Komenda: /whisper <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "Komenda: /w <ksywka> <wiadomość>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 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:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "Komenda: /query <ksywka>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "Komenda: /q <ksywka>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 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:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Komenda: /create <nazwa-grupy>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "Komenda: /party <ksywka>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "Komenda: /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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."
@@ -223,28 +339,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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "Komenda: /record <nazwa_pliku>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 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:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "Komenda: /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr "Ta komenda kończy zapisywanie sesji"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "Komenda: /toggle <stan>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -252,7 +368,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:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -260,39 +376,48 @@ 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "Komenda: /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr "Ta komenda wyświetla status przełącznika"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Komenda: /item <zasada>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Komenda: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Komenda: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Wpisz /help aby usyskać listę komend."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -301,311 +426,348 @@ msgstr ""
 "Nie można utworzyć zakładki szeptu dla ksywki \"%s\"! Już istnieje, albo to "
 "ty."
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Brakuje nazwy grupy."
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "Pomyślnie utworzono grupę."
+
+#: src/commandhandler.cpp:486
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/engine.cpp:88
-msgid "Could not load map"
-msgstr "Nie można załadować mapy"
-
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
-msgstr "Błąd podczas łądowania %s"
-
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "Zrzut ekranu zapisany do ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało utracone, program zakończy pracę"
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "Błąd sieci"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Wyjdź"
-
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "Czy na pewno chcesz wyjść?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr "nie"
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "Znajomy"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Nie można załadować mapy"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "Lista znajomych"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr "Błąd podczas łądowania %s"
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Grupa (%s)"
+
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Kup"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cena: %s/ Razem: %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
-msgstr "Maks."
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Opis: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Efekt: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Wyjdź"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr "Maks."
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Sklep"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Sprzedaj"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Zmień adres Email"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Konto: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
 msgstr "Wpisz dwukrotnie nowy adres email:"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Nowy Adres Email już istnieje"
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "Wpisz dwukrotnie nowe hasło:"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Hasło musi mieć conajmniej %d znaków."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Hasło nie może mieć więcej jak %d znaków."
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "Wpisz dwukrotnie nowe hasło:"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Imię:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Kolor włosów:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Fryzura:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Utwórz"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Mężczyzna"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Kobieta"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Błąd"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć conajmniej 4 znaki."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Potwierdź usunięcie postaci"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Zarządzanie kontem i postaciami"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Poprzednia"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Następna"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Imię: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Poziom: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Wyrejestruj"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Nowa"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Zmień adres Email"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Wyrejestruj"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Pieniądze: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "Poziom Pracy: %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Zamknij"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "Pieniądze: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "%d graczy jest obecnych."
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "Obecny: "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "Dozór wpisany do dziennika zapisu"
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -618,180 +780,222 @@ msgstr "Tak"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Łączenie..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Ekwipunek"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Zdejmij"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
-msgstr "Gildia"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "Temat: %s"
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
-msgstr "Utwórz Gildię"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Imię: %s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
-msgstr "Zaproś Użytkownika"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "MiniMapa"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Efekty Cząsteczkowe"
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Detale cząsteczek"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Efekty otoczenia"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Ekwipunek"
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
-msgstr "Opuść Gildię"
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Zdejmij"
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inwentarz"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Załóż"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Użyj"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Upuść"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Podziel"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "Miejsc:"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "Waga:"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Upuść"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "wszystkie"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "Waga: "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Serwer:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr "Ostatni:"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr "Magia"
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr "Test Rzucania Zaklęcia 1"
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr "Test Rzucania Zaklęcia 2"
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr "Test Rzucania Zaklęcia 3"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Serwer"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "Mapa"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "Oczekiwanie na serwer"
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Następna"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr "Zatwierdź"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr "Resetuj"
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Następna"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr "Do:"
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "Wyślij"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Zdejmij"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "Tekst"
 
@@ -807,325 +1011,302 @@ msgstr "Kontur Tekstu"
 msgid "Progress Bar Labels"
 msgstr "Etykiety Pasków Postępu"
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "Tło"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr "Podświetlenie"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr "Podświetlenie zakładki"
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+#, fuzzy
+msgid "Item Too Expensive"
 msgstr "Przedmiot zbyt drogi"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+#, fuzzy
+msgid "Item Is Equipped"
 msgstr "Przedmiot jest założony"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "GM"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "Gracz"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "Szept"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "Jest"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Grupa"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gildia"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr "Serwer"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "Logger"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "Hiperłącze"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr "Byty"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "Imiona Innych Graczy"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "Własne Imię"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "Imiona GM"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "NPC"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "Potwory"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr "Nieznany Typ Przedmiotu"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr "Ogólne"
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr "Kapelusze"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr "Użytkowe"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr "Koszulki"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+#, fuzzy
+msgid "One Handed Weapons"
 msgstr "Bronie jednoręczne"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "Spodnie"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "Buty"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
-msgstr "Bronie dwuręczne"
+#: src/gui/palette.cpp:122
+#, fuzzy
+msgid "Two Handed Weapons"
+msgstr "Bronie jednoręczne"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr "Tarcze"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "Pierścienie"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr "Naszyjniki"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr "Naramienniki"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "Amunicja"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr "Efekty Cząsteczkowe"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr "Powiadomienie o podniesieniu"
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr "Powiadomienie o Exp"
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+#, fuzzy
+msgid "Player Hits Monster"
 msgstr "Gracz uderza Potwora"
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+#, fuzzy
+msgid "Monster Hits Player"
 msgstr "Potwór uderza Gracza"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr "Uderzenie Krytyczne"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr "Pudła"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr "Pasek HP"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr "3/4 Paska HP"
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr "1/2 Paska HP"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr "1/4 Paska HP"
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr "Grupa (%s)"
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy."
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr "Zaakceptuj zaproszenie do grupy"
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr "Zaakceptowano zaproszenie od %s."
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr "Odrzucono zaproszenie od %s."
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Dodaj imię do czatu@@"
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Handel z %s"
 
-#: 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:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Atak %+d"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Atakuj %s@@"
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Szept"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+#: src/gui/popupmenu.cpp:101
+#, fuzzy, c-format
+msgid "Befriend %s"
 msgstr "@@friend|Zaprzyjaźnij się z %s@@"
 
-#: src/gui/popupmenu.cpp:99
-#, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|Lekceważ %s@@"
+#: src/gui/popupmenu.cpp:106
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Nielubiany"
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore|Ignoruj %s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorowany"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
-msgstr "@@unignore|Przestań Ignorować %s@@"
+msgid "Unignore %s"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:118
+#, fuzzy, c-format
+msgid "Completely ignore %s"
 msgstr "@@ignore|Kompletnie ignoruj %s@@"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
 msgstr "@@guild|Zaproś %s aby dołączył do twojej gildii@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Zaproś %s do grupy@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Wykop gracza@@"
+#: src/gui/popupmenu.cpp:144
+#, fuzzy
+msgid "Kick player"
+msgstr "Wykopanie nie powiodło się!"
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:153
+#, fuzzy, c-format
+msgid "Talk to %s"
 msgstr "@@talk|Rozmawiaj z %s@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+#, fuzzy
+msgid "Kick monster"
 msgstr "@@admin-kick|Wykop potwora@@"
 
-#: 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:174
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|Dodaj imię do czatu@@"
 
-#: src/gui/popupmenu.cpp:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Podnieś %s@@"
+#: src/gui/popupmenu.cpp:191
+#, fuzzy, c-format
+msgid "Pick up %s"
+msgstr "Podnieś"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#, fuzzy
+msgid "Add to chat"
 msgstr "@@chat|Dodaj do czatu@@"
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@use|Zdejmij@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Załóż@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Użyj@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Upuść@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Rozdziel@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
-msgstr "@@store|Zachowaj@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr "Przechowaj"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|Pobierz@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
+msgstr "Pobierz"
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Zmień serwer"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Zmień postać"
 
@@ -1145,137 +1326,189 @@ msgstr "Już zapisuje."
 msgid "Starting to record..."
 msgstr "Rozpoczęcie zapisywania..."
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr "Rozpoczęcie zapisywania nie powiodło się."
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr "Zapisywanie..."
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr "Zatrzymaj zapisywanie"
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Potwierdź:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Hasło musi mieć conajmniej %d znaków."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Hasło nie może mieć więcej jak %d znaków."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+#, fuzzy
+msgid "Choose Your Server"
 msgstr "Wybierz twój serwer"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Serwer:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Serwer:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Łączenie..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Własny kursor"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Wybierz serwer"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Konfiguracja"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Zastosuj"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Oczekiwanie na serwer"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Zresetuj okna"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Brak tekstu"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr "Kolor będzie wyglądał w ten sposób"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+#, fuzzy
+msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr "Statyczny"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "Puls"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "Tęcza"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "Widmo"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
 msgstr "Opóźnienie: "
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+#, fuzzy
+msgid "Red:"
 msgstr "Czerwony: "
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
 msgstr "Zielony: "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+#, fuzzy
+msgid "Blue:"
 msgstr "Niebieski: "
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Zastosuj"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Zresetuj okna"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
@@ -1316,432 +1549,623 @@ msgstr "Domyślny"
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr "Rozwiąż je, albo granie może być utrudnione."
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Relacja"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Przyjaciel"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "Nielubiany"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Ignorowany"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr "Umieść wszystkie szepty w zakładkach"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "Pokaż imię"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Gracze"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr "Drobna"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "Mała"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "Średnia"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr "Duża"
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr "Brak tekstu"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Bąbelki, brak imion"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr "Bąbelki z imionami"
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "wyłączone"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "niskie"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "wysokie"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "średnie"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "max"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Pełen ekran"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Widoczne imiona"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "Efekty cząsteczkowe"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+#, fuzzy
+msgid "Show own name"
 msgstr "Pokaż imię"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr "Pokaż powiadomienie o podniesieniu"
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr "w czacie"
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr "jako cząsteczkę"
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Obraz"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "Pokaż imię"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr "Tekst nad głową"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Przezroczystość GUI"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Efekty otoczenia"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "Detale cząsteczek"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "Nie udało się przełączyć na "
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "w oknie"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Nie"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
-msgstr "pełny ekran"
+#: src/gui/setup_video.cpp:381
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Przełączanie na pełen ekran"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Zmień na OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "Zmieniono rozdzielczość ekranu"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_video.cpp:522
+#, fuzzy
+msgid "Particle Effect Settings Changed."
 msgstr "Zmieniono ustawienia ef. cząsteczek"
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:523
 msgid "Changes will take effect on map change."
 msgstr "Efekty nastąpią po zmianie mapy."
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "Tajemnicza umiejętność"
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Zdolności"
 
-#: 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:149
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "Góra"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
-msgstr "Bronie"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Punkty umiejętności: %d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Punkty umiejętności: %d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Zdolności"
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
-msgstr "Rzemiosła"
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Poziom: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Poziom: %d"
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:117
 #, c-format
-msgid "Job: %d"
-msgstr "Praca: %d"
+msgid "Invited user %s to guild %s."
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
-msgstr "HP:"
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gildia została utworzona."
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
-msgstr "Exp:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
-msgstr "Praca:"
+#: src/gui/socialwindow.cpp:146
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "Utwórz Gildię"
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Statystyki"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Razem"
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Koszt"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Atak:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Zaproś użytkownika do grupy"
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "Obrona:"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "Atak M.:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "Obrona M.:"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Czy na pewno chcesz wyjść?"
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Celność:"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "Utwórz Gildię"
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% Unik:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Stwórz postać"
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% Refleks:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Siła"
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "Zaproś Użytkownika"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "Zwinność"
+#: src/gui/socialwindow.cpp:298
+#, fuzzy
+msgid "Leave"
+msgstr "Duża"
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "Witalność"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "Inteligencja"
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Zręczność"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Zaakceptowano zaproszenie od %s."
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Szczęście"
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Odrzucono zaproszenie od %s."
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Błąd podczas tworzenia gildii."
+
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "Pozostało Punktów Statusu: %d"
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
-msgstr "Maks. poziom"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Gildia"
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
-msgstr "Magazyn"
+#: src/gui/socialwindow.cpp:485
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "Wybierz twój serwer"
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
-msgstr "Przechowaj"
+#: src/gui/socialwindow.cpp:497
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
-msgstr "Pobierz"
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+
+#: src/gui/socialwindow.cpp:507
+#, fuzzy
+msgid "Accept Guild Invite"
+msgstr "Zaakceptuj zaproszenie do grupy"
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr "Otrzymano prośbę o założenie grupy, ale ona już istnieje."
+
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy."
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
 
-#: src/gui/trade.cpp:51
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy."
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s zaprosił ciebie, byś dołączył do grupy %s ."
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr "Zaakceptuj zaproszenie do grupy"
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+#, fuzzy
+msgid "Party Name"
+msgstr "Grupa"
+
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Wybierz twój serwer"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Poziom: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "Pieniądze: %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr "HP:"
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr "Exp:"
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr "MP:"
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "Praca: %d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr "Praca:"
+
+#: src/gui/statuswindow.cpp:194
+#, fuzzy
+msgid "HP"
+msgstr "HP:"
+
+#: src/gui/statuswindow.cpp:200
+#, fuzzy
+msgid "MP"
+msgstr "MP:"
+
+#: src/gui/statuswindow.cpp:206
+#, fuzzy
+msgid "Exp"
+msgstr "Exp:"
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Pieniądze: %d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "Praca:"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Statystyki postaci w porządku."
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Punkty umiejętności: %d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Poziom: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr "Magazyn"
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Oferuj handel"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr "Potwierdzono. Oczekiwanie..."
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr "Akceptuj handel"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr "Zaakceptowano. Oczekiwanie..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "Handel: Ty"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
 msgstr "Otrzymujesz %s"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Dajesz:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Zmień"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
 "rodzaj przedmiotu w okienku."
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Imię: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Łączenie..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Graj"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "błąd curl "
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " host: "
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "##1 spróbował później"
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -1793,636 +2217,744 @@ msgstr "Komenda powoduje opuszczenie obecnego kanału."
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "Jeżeli jesteś ostatnią osobą na kanale, zostanie on usunięty."
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "Komenda: /op <ksywka>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr "Ta komenda uczyni <ksywka> operatorem kanału."
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "Operatorzy kanału mogą wykopywać i dawać opy użytkownikom kanału."
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "Komenda: /kick <ksywka>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr "Komenda spowoduje, iż <ksywka> opuści kanał."
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "Wymagany użytkownik, aby przydzielić opa!"
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr "Wymagany użytkownk, aby go wykopać!"
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Ogłoszenie ogólne:"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Ogłoszenie ogólne od %s:"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
 msgstr "%s szepcze: "
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr "Nie można wysłać pustego czatu!"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr "/close > Zamyka zakładkę szeptania"
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr "Komenda: /close"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr "Komenda zamyka obecną zakładkę szeptania"
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Stan"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Komenda: /przedmiot"
+
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Ta komenda wyświetla liczbę połączonych graczy."
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Gildie"
+#: src/gui/widgets/whispertab.cpp:94
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Ta komenda rozpoczyna zapisywanie dziennika czatu to pliku <nazwa_pliku."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr "Znajomi"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Stan"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Skrót"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Wybrano OK"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Zmień"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Wybierz twój serwer"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr "Przesuń w górę"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr "Przesuń w dół"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr "Przesuń w lewo"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr "Atak"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr "Namierz i Atakuj"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr "Emotikonka"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr "Rozmowa"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr "Zatrzymaj Atak"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
 msgstr "Namierz najbliższy cel"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr "Namierz NPC"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr "Namierz Gracza"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr "Podnieś"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr "Ukryj Okna"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr "Usiądź"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr "Znajdź Ścieżkę do Myszy"
 
-#: 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
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Skrót Przedmiotu %d"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr "Okno Pomocy"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr "Okno statusu"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr "Okno Inwentarza"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr "Okno Ekwipunku"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr "Okno Minimapy"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr "Okno Czatu"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr "Okno Skrótów Przedmiotów"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr "Okno Ustawień"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr "Okno diagnostyczne"
 
-#: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr "Okno Grupy"
+#: src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Social Window"
+msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr "Okno Skrótów Emotek"
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Okno statusu"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr "Nieuzbrojony"
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr "Nóż"
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr "Miecz"
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr "Kij"
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr "Laska"
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr "Bat"
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr "Łuk"
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr "Strzelectwo"
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr "Maczuga"
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr "Topór"
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr "Rzucana"
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr "Rrzemiosło"
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr "Nieznana Umiejętność"
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr "Nieprawidłowy host aktualizacji: "
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr " nie może być utworzony, ale nie istnieje! Kończenie."
-
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "Nie można ustawić "
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Rozwiąż je, albo granie może być utrudnione."
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr " tryb wideo: "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
+msgstr "Nie można podnieść przedmiotu."
 
-#: src/main.cpp:575
-msgid "mana"
-msgstr "mana"
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
+msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr "  -d --data        : Katalog, z którego załadować dane gry"
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr "  -D --default     : Wybierz domyślny serwer postaci i postać"
+#: src/main.cpp:45
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version     : Pokazuje wersję"
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Pokazuje tę pomoc"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
-msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
+#: src/main.cpp:47
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Plik konfiguracyjny do użycia"
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
-msgstr "  -H --update-host : Użyj tego hosta aktualizacji"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username    : Zaloguj z tą nazwą użytkownika"
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Zaloguj z tym hasłem"
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Zaloguj z tą postacią"
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
-msgstr "  -p --port        : Port serwera logowania"
-
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Nazwa serwera logowania, lub IP"
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
-msgstr "  -u --skip-update : Pomiń pobieranie aktualizacji"
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port        : Port serwera logowania"
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
-msgstr "  -U --username    : Zaloguj z tą nazwą użytkownika"
+#: src/main.cpp:53
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Użyj tego hosta aktualizacji"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Wyłącz OpenGL dla tej sesji"
+#: src/main.cpp:54
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default     : Wybierz domyślny serwer postaci i postać"
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
-msgstr "  -v --version     : Pokazuje wersję"
+#: src/main.cpp:56
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Pomiń pobieranie aktualizacji"
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Łączenie z serwerem map..."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data        : Katalog, z którego załadować dane gry"
+
+#: src/main.cpp:58
+#, fuzzy
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "Łączenie z serwerem postaci..."
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir    : Katalog do użycia jako katalog domowy"
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Łączenie z serwerem kont..."
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl   : Wyłącz OpenGL dla tej sesji"
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr "Wykopanie nie powiodło się!"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr "Wykopanie powiodło się!"
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr "Nie masz niczego do sprzedania."
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr "Dziękuję za kupno."
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr "Nie można kupić."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr "Dziękuję za sprzedaż."
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr "Nie można sprzedać."
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+#, fuzzy
+msgid "Access denied."
 msgstr "Dostęp zabroniony"
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
 msgstr "Nie można uzyć tego ID"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown failure to select character."
 msgstr "Nieznany błąd podczas wyboru postaci"
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Utworzenie postaci nie powiodło się. Najprawdopodobniej imię jest już zajęte."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr "Usunięto postać."
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr "Usunięcie gracza nie powiodło się."
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Siła:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Zwinność:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Witalność:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Zręczność:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr "Szczęście:"
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr "Szept nie mógł zostać wysłany, użytkownik jest offline."
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany przez odbiorcę."
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Gracz"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr "Kanały nie są wspierane!"
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
-msgstr "Nie można założyć."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr "Nie można zdjąć."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nazwa"
+
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Prośba o Handel"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "Siła %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr "Zwinność %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "Witalność %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencja %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Zręczność %+d"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Szczęście %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
 msgstr "Uwierzytelnienie nie powiodło się"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
 msgstr "Brak dostępnych serwerów"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+#, fuzzy
+msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć tego konta"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+#, fuzzy
+msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+#, fuzzy
+msgid "Speed hack detected."
 msgstr "Wykryto Speed hack"
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+#, fuzzy
+msgid "Duplicated login."
 msgstr "Zduplikowany login"
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Siła"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "Zwinność"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "Witalność"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "Inteligencja"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Zręczność"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Szczęście"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Obrona:"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Atak M.:"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Obrona M.:"
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Celność:"
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Unik:"
+
+#: src/net/ea/generalhandler.cpp:229
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Uderzenie Krytyczne"
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Wyświetla tą pomoc"
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
-msgstr "/create > Utworzenie nowej grupy"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Zaproszenie gracza do twojej grupy"
+
+#: src/net/ea/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Opuszenie grupy, w której jesteś"
+
+#: src/net/ea/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Komenda: /invite <ksywka>"
+
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Komenda: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Komenda powoduje opuszczenie grupy przez gracza"
+
+#: src/net/ea/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Brakuje nazwy grupy."
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
-msgstr "/new > Alias create"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s jest od teraz członkiem twojej grupy."
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Nieznana odpowiedź na zaproszenie dla %s"
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Zaproszenie gracza do twojej grupy"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Opuszenie grupy, w której jesteś"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Pokaż/zmień opcje podziału przedmiotu w grupie"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Pokaż/zmień opcje pozdziału doświadczenia w grupie"
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
-msgstr "Komenda: /new <nazwa-grupy>"
-
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
-msgstr "Komenda: /create <nazwa-grupy>"
-
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
-msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
-
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
-msgstr "Komenda: /invite <ksywka>"
-
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
-msgstr "Komenda: /leave"
-
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Komenda powoduje opuszczenie grupy przez gracza"
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Komenda: /item <zasada>"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Komenda zmienia zasadę pozdziału przedmiotu w grupie"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2430,23 +2962,23 @@ msgstr ""
 "<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
 "przedmiotu lub \"0\", \"no\", \"false\" by wyłączyć podział przedmiotu."
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Komenda: /przedmiot"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Komenda pokazuje zasadę pozdziału przedmiotu w grupie."
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Komenda: /exp <zadada>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Komenda zmienia zasadę pozdziału doświadczenia w grupie."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2455,102 +2987,109 @@ msgstr ""
 "doświadczenia, lub \"0\", \"no\", \"false\" aby wyłączyć pozdział "
 "doświadczenia."
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Komenda: /exp"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Komenda pokazuje obecną zasadę podziału doświadczenia w grupie."
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr "Brakuje nazwy grupy."
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr "Podział przedmiotu włączony."
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr "Podział przedmiotu wyłączony."
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr "Podział przedmiotu nie jest możliwy."
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Podział przedmiotu włączony."
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr "Podział doświadczenia nie jest możliwy."
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
-msgstr "Nie można podnieść przedmiotu."
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
-msgstr ""
-
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "Podniosłeś %s [@@%d|%s@@]."
+#: src/net/ea/gui/partytab.cpp:176
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Podział doświadczenia włączony."
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:281
 msgid "Failed to use item."
 msgstr "Użycie przedmiotu nie powiodło się."
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
+msgstr "Nie można założyć."
+
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr "Nie można zdjąć."
+
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr "Nie znaleziono Konta. Proszę zalogować się ponownie."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
 msgstr "Stare hasło jest nieprawidłowe"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+#, fuzzy
+msgid "New password too short."
 msgstr "Nowe hasło jest za krótkie"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
 msgstr "Nieznany błąd"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
 msgstr "Nieprawidłowe hasło"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+#, fuzzy
+msgid "Account expired."
 msgstr "Konto wygasło"
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
 msgstr "Odrzucony z serwera"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
+#, fuzzy
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr "Zostałeś tymczasowo zbanowany. Proszę skontaktować się z zespołem GM."
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2559,86 +3098,105 @@ msgstr ""
 "Zostałeś tymczasowo zbanowany z gry do dnia %s.\n"
 "Proszę skontaktować się z zespołem GM poprzez forum."
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
 msgstr "Ta nazwa użytkownika jest już zajęta"
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "Nie można sprzedać."
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Łączenie z serwerem map..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Nie można utworzyć grupy."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Pomyślnie utworzono grupę."
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s już jest członkiem grupy."
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s odmówił zaproszenia."
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, 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:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Nieznana odpowiedź na zaproszenie dla %s"
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr "Opuściłeś grupę."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr "%s opuścił twoją grupę."
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Nieznany członek próbował powiedzieć: %s"
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr "Zapraszanie w ten sposób nie jest obecnie wspierane."
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "Jesteś martwy."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Ubolewamy, inforumując iż twoja postać została zabita w bitwie."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "Już nie jesteś taki żywy."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Skostniałe łapy ponurego żniwiarza sięgają po twoją duszę."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "Koniec gry!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2646,7 +3204,7 @@ msgstr ""
 "Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
 "do lepszego miejsca."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2654,358 +3212,525 @@ msgstr ""
 "Twój plan zniszczenia broni wrogów poprzez uderzanie o nią twoim gardłem "
 "zawiódł."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "Czy chesz zidentyfikować twoje rzeczy?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Niestety, ślad po tobie zaginął..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "Unicestwiony."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "Wygląda na to, że podano tobie twoją głowę."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Znowu nawaliłeś, wrzuć swoje ciało do rur i weź sobie nowe."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "Jeszcze nie umarłeś. Po prostu odpoczywasz."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "Więcej ciebie nie ma."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "Przestałeś istnieć."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "Odszedłeś na spotkanie ze swoim stwórcą."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "Jesteś sztywniakiem."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "Opuściło cię życie. Teraz spoczywasz w spokoju."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Gdybyś nie był taki aktywny, nadal byś zrywał kwiatki."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "Twoje procesy metaboliczne są teraz historią."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "Kopnąłeś w kalendarz."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "Jesteś ex-graczem."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 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:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 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:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "Podniosłeś "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr "Najpierw załóż strzały."
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Handel zakończony niepowodzeniem!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Emotka nieudana!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Siad nieudany!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Utworzenie czatu nieudane!"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Nie można dołączyć do grupy!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Nie można krzyknąć!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Masz za niski poziom!"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "Niewystarczające HP!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "Niewystarczające SP!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Nie masz notatek!"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Nie możesz teraz tego zrobić!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "Wygląda na to, że potrzebujesz wiecej pieniędzy... ;-)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego kamienia!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego kamienia!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Jesteś zbyt obciążony aby to zrobić!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "O! Co to?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Nie mogę nic ukraść..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Trucizna nie zadziałała..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr "Prośba o Handel"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s chce handlować z tobą, zgadzasz się?"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 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:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Handlowanie nie jest możliwe. Postać nie istnieje."
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Handel anulowany z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Handel: Ty i %s"
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Handel z %s został anulowany."
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr "Nieobsługiwany pakiet anulowania handlu."
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 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:203
+#: src/net/ea/tradehandler.cpp:207
 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:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Dodanie przedmiotu nie powiodło się z nieznanego powodu."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "Handel anulowany."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "Handel zakończony."
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "Press OK to respawn."
 msgstr " Naciśnij OK, aby się odrodzić"
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
 msgstr "Umarłeś"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "Już zalogowany"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Nazwa użytkownika już istnieje"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Statystyki postaci w porządku."
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Statystyki postaci w porządku."
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Gracz usunięty"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Wybierz ilość przedmiotów do handlu."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Nieznany błąd"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "Brak dostępnych serwerów gier"
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Siła woli:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr "Temat: %s"
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Gracz uderza Potwora"
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Komenda: /join <kanał>"
+
+#: src/net/manaserv/chathandler.cpp:207
+#, fuzzy
+msgid "Listing channels."
+msgstr "Prośba o dołączenie do kanału %s."
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s dołączył do grupy."
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Nieznane polecenie."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "Siła woli %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Siła woli:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "Gildia została utworzona."
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr "Błąd podczas tworzenia gildii."
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr "Zaproszenie wysłane."
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr "Członek został pomyślnie wypromowany."
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr "Promocja Członka nie powiodła się."
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
 msgstr "Zły magic_token"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "Już zalogowany"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "Serwer jest pełny"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "Nowe hasło jest nieprawidłowe"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "Konto niepołączone. Proszę najpierw się zalogować."
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "Nowy adres email jest niepoprawny"
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "Stary adres email jest niepoprawny"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "Nowy Adres Email już istnieje"
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "Wersja klienta jest zbyt stara"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "Zła nazwa użytkownika lub hasło"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "Zła nazwa użytkownika, hasło, lub adres email"
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "Nazwa użytkownika już istnieje"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "Adres email już istnieje"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr "Dołączono do grupy."
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr "%s dołączył do grupy."
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s odmówił zaproszenia."
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr "Akceptowanie nadchodzących próśb o handel."
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorowanie nadchodzących próśb o handel."
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr "Handel z %s"
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Kompletnie ignoruj %s@@"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3026,23 +3751,233 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "Nienazwany"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "nienazwany"
 
-#~ msgid "Select Character"
-#~ msgstr "Wybierz postać"
+#~ msgid "no"
+#~ msgstr "nie"
+
+#~ msgid "Buddy"
+#~ msgstr "Znajomy"
+
+#~ msgid "Buddy List"
+#~ msgstr "Lista znajomych"
+
+#~ msgid "Description: %s"
+#~ msgstr "Opis: %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Efekt: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Poprzednia"
+
+#~ msgid "New"
+#~ msgstr "Nowa"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Poziom Pracy: %d"
+
+#~ msgid "Present: "
+#~ msgstr "Obecny: "
+
+#~ msgid "Quit Guild"
+#~ msgstr "Opuść Gildię"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Recent:"
+#~ msgstr "Ostatni:"
+
+#~ msgid "Magic"
+#~ msgstr "Magia"
+
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Test Rzucania Zaklęcia 1"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Test Rzucania Zaklęcia 2"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Test Rzucania Zaklęcia 3"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Bronie dwuręczne"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Handel z %s@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Atakuj %s@@"
+
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Lekceważ %s@@"
+
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignoruj %s@@"
+
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Przestań Ignorować %s@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Wykop gracza@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Anuluj@@"
+
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Podnieś %s@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Zdejmij@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Załóż@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Użyj@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Upuść@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Rozdziel@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Zachowaj@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Pobierz@@"
+
+#~ msgid "Select Server"
+#~ msgstr "Wybierz serwer"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "Nie udało się przełączyć na "
 
-#~ msgid "MiniMap"
-#~ msgstr "MiniMapa"
+#~ msgid "windowed"
+#~ msgstr "w oknie"
+
+#~ msgid "fullscreen"
+#~ msgstr "pełny ekran"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "Tajemnicza umiejętność"
+
+#~ msgid "Weapons"
+#~ msgstr "Bronie"
+
+#~ msgid "Crafts"
+#~ msgstr "Rzemiosła"
+
+#~ msgid "Stats"
+#~ msgstr "Statystyki"
+
+#~ msgid "Total"
+#~ msgstr "Razem"
+
+#~ msgid "Cost"
+#~ msgstr "Koszt"
+
+#~ msgid "Attack:"
+#~ msgstr "Atak:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Refleks:"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Pozostało Punktów Statusu: %d"
+
+#~ msgid "Max level"
+#~ msgstr "Maks. poziom"
+
+#~ msgid "curl error "
+#~ msgstr "błąd curl "
+
+#~ msgid " host: "
+#~ msgstr " host: "
+
+#~ msgid "Guilds"
+#~ msgstr "Gildie"
+
+#~ msgid "Buddys"
+#~ msgstr "Znajomi"
+
+#~ msgid "Party Window"
+#~ msgstr "Okno Grupy"
+
+#~ msgid "Unarmed"
+#~ msgstr "Nieuzbrojony"
+
+#~ msgid "Knife"
+#~ msgstr "Nóż"
+
+#~ msgid "Sword"
+#~ msgstr "Miecz"
+
+#~ msgid "Polearm"
+#~ msgstr "Kij"
+
+#~ msgid "Staff"
+#~ msgstr "Laska"
+
+#~ msgid "Whip"
+#~ msgstr "Bat"
+
+#~ msgid "Bow"
+#~ msgstr "Łuk"
+
+#~ msgid "Shooting"
+#~ msgstr "Strzelectwo"
+
+#~ msgid "Mace"
+#~ msgstr "Maczuga"
+
+#~ msgid "Axe"
+#~ msgstr "Topór"
+
+#~ msgid "Thrown"
+#~ msgstr "Rzucana"
+
+#~ msgid "Craft"
+#~ msgstr "Rrzemiosło"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "Nieznana Umiejętność"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " nie może być utworzony, ale nie istnieje! Kończenie."
+
+#~ msgid "Couldn't set "
+#~ msgstr "Nie można ustawić "
+
+#~ msgid " video mode: "
+#~ msgstr " tryb wideo: "
+
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "Łączenie z serwerem postaci..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Łączenie z serwerem kont..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Komenda: /new <nazwa-grupy>"
+
+#~ msgid "Unnamed"
+#~ msgstr "Nienazwany"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Skok przy przewijaniu ekranu"
@@ -3097,9 +4032,6 @@ msgstr "nienazwany"
 #~ msgid "Emote Window"
 #~ msgstr "Okno Emotek"
 
-#~ msgid "Player deleted"
-#~ msgstr "Gracz usunięty"
-
 #~ msgid "items.xml"
 #~ msgstr "items.xml"
 
diff --git a/po/pt.po b/po/pt.po
index 6e1089e4..9c9c9686 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-06-06 21:57+0000\n"
 "Last-Translator: Diogo Lavareda <diogolavareda9@hotmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -17,577 +17,723 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-08 19:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Configuração"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Conectando..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Autenticar"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Seleccione um Personagem"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Erro"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Senha:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Modificar"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Remover o Registo"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Comando desconhecido"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Ajuda --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Mostra a ajuda"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Mostra o nome do mapa"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Mostra o numero de utilizadores online"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diga alguma coisa sobre si"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Limpa a janela"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envia uma mensagem privata a um utilizador"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Cria um separador para mensagens privadas com outro utlizador"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Mostra todos os canais públicos"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Junte-se ou crie um canal"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Inicie a gravação da conversa para um ficheiro externo"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr "Para mais informações, escreva /help <command>."
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Este comando mostra a lista de todos os comandos disponiveis"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Comando: /help <command>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Comando: /help"
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Comando: /help <command>"
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Sair"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Descrição: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Efeito: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Sair"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "O nome de utilizador só pode ter %d caracteres."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "A password necessita de pelo menos %d caracteres."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "A password só pode ter até %d caracteres."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Cor de Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d potos"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Erro"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "O seu nome necessita de pelo menos 4 caracteres"
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Estatisticas da personagem OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem a certeza que quer apagar este personagem"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Seguinte"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Nome: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Nível: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Remover o Registo"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Novo"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Modificar"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Remover o Registo"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Dinheiro: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,180 +746,221 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Conectando..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Equipamento"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Desequipar"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Efeitos Ambientais"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Equipamento"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Desequipar"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventário"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Largar"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Largar"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Seleccionar a quantidade de itens a negociar."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Seleccionar a quantidade de itens a largar."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Seleccionar a quantidade de itens a dividir."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Efeito: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Autenticar"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr ""
-
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registo"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Modificar"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Seguinte"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Seguinte"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Desequipar"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -789,325 +976,294 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Negociar com %s@@"
 
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
 msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
 
-#: src/gui/partywindow.cpp:182
+#: src/gui/popupmenu.cpp:92
 #, c-format
-msgid "%s has invited you to join their party."
+msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "%s has invited you to join the %s party."
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Negociar com %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Atacar %s@@"
-
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 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:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Equipar@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Usar@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Largar@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Dividir@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Mudar de servidor"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Mudar de personagem"
 
@@ -1127,137 +1283,181 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome de utilizador só pode ter %d caracteres."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A password necessita de pelo menos %d caracteres."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A password só pode ter até %d caracteres."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "As senhas não coincidem."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Porta:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Servidor:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Conectando..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Cursor personalizado"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor escreva o endereço e a porta do servidor."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Configuração"
-
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Aplicar"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Reiniciar Janelas"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volume dos Efeitos"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Reiniciar Janelas"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Pressione o botão para começar a calibragem"
@@ -1298,430 +1498,597 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "elevado"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Ecrã completo"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Opacidade do Interface"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Efeitos Ambientais"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Não"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Mudar para ecrã completo"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "É necessário reiniciar para as alterações terem efeito."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Mudando OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Competências"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Competências"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nível: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nível: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Tem a certeza que quer apagar este personagem"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Tem a certeza que quer apagar este personagem"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Criar Personagem"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Nível: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Dinheiro: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Estatisticas da personagem OK"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Nível: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Propor Negócio"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Dá:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Dá:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Modificar"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Conectando..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1773,1206 +2140,1440 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Estado"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Comando: /help"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Estado"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Modificar"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr ""
-
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
-msgstr ""
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "/help > Mostra a ajuda"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nome:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
 msgstr ""
+"Copy text   \t\r\n"
+"Defesa %+d"
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr ""
+"Copy text   \t\r\n"
+"Ataque %+d"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr ""
+"Copy text   \t\r\n"
+"Defesa %+d"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "Comando desconhecido"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Remover o Registo"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Dá:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Estatisticas da personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Estatisticas da personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Seleccionar a quantidade de itens a negociar."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Comando desconhecido"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Comando desconhecido"
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Força de Vontade:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2997,17 +3598,41 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Seleccione um Personagem"
+#~ msgid "Description: %s"
+#~ msgstr "Descrição: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "New"
+#~ msgstr "Novo"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Atacar %s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equipar@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Usar@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Largar@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dividir@@"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d299b655..e51504fd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-05-19 23:56+0000\n"
 "Last-Translator: Rosiney Gomes Pereira <rosiney.gp@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,581 +17,734 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-28 20:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Configurar"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Conectando ao servidor de mapas..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Login"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Selecionar personagem"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Conectando ao servidor de mapas..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Erro"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Senha:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Mudar"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Cancelar Registro"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "--Ajuda--"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Exibe ajuda"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Exibe o nome do mapa"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Exibe o número de usuários online"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diz alguma coisa sobre você"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Lista janela atual"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envia uma messagem privada a um usuário"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Messagem Confidêncial"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Abreviação de messagem"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Fazer um chat com outros usuários"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > Abreviação de query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Exibir todos os canais públicos"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Criar ou entrar em um canal"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/party > Convidar um usuário para a festa"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > Convidar um usuário para a festa"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Começar a gravar o chat em um arquivo externo"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Determinar um clima <return> alternar o log de chat"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Pegar a lista de jogadores presentes (Enviou log de chat. Se "
 "logando)"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Anuciamento Global (Somente GM)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "Para mais informações, digite /help <comando>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Exibe uma lista de todos os comandos disponiveis."
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Comando: /help <comando>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Exibe o conteudo de ajuda de <comando>"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Comandos: /announce <msg>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** Disponivel apenas para GM's ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 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:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Comandos: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "Limpa os logs do chat anterior."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Command: /join <channel>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Exibe o total de jogadores online."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Command: /join <channel>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "Este comando faz você entrar <channel>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Se <channel> não existe, Isto já existe."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "Comando: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "Este comando exibe uma lista com todos os canais."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "Command: /me <message>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "Command: /msg <nick> <message>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "Command: /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "Command: /w <nick> <message>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "Este comando envia um texto <message> para <nick>."
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 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:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "Command: /query <nick>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "Command: /q <nick>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Command: /query <nick>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Este comando faz você entrar <channel>."
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Comandos: /announce <msg>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "Mostra o nome do mapa atual."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Comando: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr "Exibe o total de jogadores online."
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Digite /help para uma lista de todos os comandos."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-#, fuzzy
-msgid "Could not load map"
-msgstr "Impossivel entrar no grupo!"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Sair"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
+msgstr "Conectando ao servidor de personagens..."
+
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Impossivel entrar no grupo!"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Comprar"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Descrição: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Efeito: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Sair"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Loja"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Vender"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Alterar e-mail"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Conta: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "O nome do usuário tem que ser inferior a %d caracteres."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "A senha deve ter pelo menos %d caracteres."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "A senha deve ser menor que %d caracteres."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Criar"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Homem"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Mulher"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Erro"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome precisa ter no mínimo 4 caracteres."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Status do personagem OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Gerenciamento de Conta e Personagem"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "OK"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Próximo"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Nome: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Nível: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Cancelar Registro"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Novo"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Alterar e-mail"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Cancelar Registro"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Dinheiro: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "Nível de Trabalho: %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Fechar"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurrando para %s: %s"
@@ -604,180 +757,222 @@ msgstr "Sim"
 msgid "No"
 msgstr "Não"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Conectando..."
-
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Equipamento"
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Desequipar"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Nome: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Conta: %s"
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Detalhe de partículas"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Ambiente FX"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Equipamento"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Desequipar"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventório"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Equipar"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Usar"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Descartar"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dividir"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Descartar"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "OK"
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Selecionar montante de itens para negociar."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Selecionar montante de itens para descartar."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Selecionar montante de itens para dividir."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Efeito: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Servidor:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Porta:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr ""
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Lembrar nome de usuário"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Mudar"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Próximo"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Próximo"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Desequipar"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -793,325 +988,292 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@Negociar|Negociar com %s@@"
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Ataque %+d"
 
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Sussurrando para %s: %s"
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@Negociar|Negociar com %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@atacar|Atacar %s@@"
-
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:106
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Desconsiderado"
 
-#: src/gui/popupmenu.cpp:99
-#, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorado"
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
+msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "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:174
+msgid "Add name to chat"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@usar|Desequipar@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@usar|Equipar@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@usar|Usar@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@descartar|Descartar@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@dividir|Dividir@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Trocar de Personagem"
 
@@ -1131,137 +1293,183 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome do usuário tem que ser inferior a %d caracteres."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "A senha deve ter pelo menos %d caracteres."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "A senha deve ser menor que %d caracteres."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Servidor:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Porta:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Servidor:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Conectando..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Cursor customizado"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Selecionar Servidor"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Configurar"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Aplicar"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Conectando ao servidor de mapas..."
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Restaurar janelas"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Som"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
-msgstr ""
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
+msgstr "Jogar"
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Restaurar janelas"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Aperto o botão para começar a calibração"
@@ -1302,432 +1510,603 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos nas teclas detectado."
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Relação"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutro"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Amigo"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "Desconsiderado"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Permitir trocas"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "Permitir sussuros"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Jogadores"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "Quando ignorado:"
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "desligado"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "baixo"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "alto"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "médio"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "máximo"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Opacidade da GUI"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Não"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Mudando para Tela cheia"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Trocando OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "Habilidade Mistério"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
+msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Habilidades"
 
-#: 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:149
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "Acima"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Pontos de habilidade: %d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Pontos de habilidade: %d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Habilidades"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nível: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nível: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
-msgstr "Trabalho: %d"
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Tem certeza que deseja excluir este personagem?"
+
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Convidar um usuário para a festa"
+
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Convidar um usuário para a festa"
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Status"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Tem certeza que deseja excluir este personagem?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Total"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Custo"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Criar Personagem"
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Ataque:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "Defesa:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "M. Ataque:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "M. Defesa:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Acuracidade:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% Evasão:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% Reflexo:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Força"
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Falha ao criar Chat!"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "Agilidade"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "Vitalidade"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Guildas"
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "Inteligência"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
+msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Destreza"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Sorte"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "Pontos de Status Restantes: %d"
+msgid "You have been invited to join the %s party."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Nível: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "Trabalho: %d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Dinheiro: %d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "Trabalho: %d"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Status do personagem OK"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Pontos de habilidade: %d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Nível: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Propor negócio"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "Comércio"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Você dá:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Você dá:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Mudar"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 #, fuzzy
 msgid "You don't have enough money."
 msgstr "Você não tem nenhuma nota armazenada"
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nome: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Jogar"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Concluído"
 
@@ -1779,1209 +2158,1452 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
-msgstr ""
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "Sussurrando para %s: %s"
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Status"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Comando: /where"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Guildas"
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Exibe o total de jogadores online."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Selecionar Servidor"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Mudar"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Equipamento"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Equipamento"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr ""
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Corrija-os, ou o jogo irá se comportar de forma estranha."
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "/help > Exibe ajuda"
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Conectando ao servidor de mapas..."
-
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "Conectando ao servidor de personagens..."
-
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Conectando ao servidor de contas..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Confimar exclusão do personagem"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Força:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Jogadores"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Nome"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Falha ao criar Chat!"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Força"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "Agilidade"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Destreza"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Sorte"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Defesa:"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "M. Ataque:"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "M. Defesa:"
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Acuracidade:"
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% Evasão:"
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/party > Convidar um usuário para a festa"
+
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando envia um texto <message> para <nick>."
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "Comando desconhecido."
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Cancelar Registro"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "Alterar senha"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
+msgstr "Você foi desconectado do servidor!"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Conectando ao servidor de mapas..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Falha no Emote!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem nivel necessário!"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra gema azul!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Você dá:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Confimar exclusão do personagem"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Status do personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Status do personagem OK"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Confimar exclusão do personagem"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Selecionar montante de itens para negociar."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Comando desconhecido."
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Força de Vontade:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Command: /join <channel>"
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Comando desconhecido."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Força de Vontade:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Falha ao criar Chat!"
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "Concluído"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3002,20 +3624,77 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "Sem nome"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Selecionar personagem"
+#~ msgid "Description: %s"
+#~ msgstr "Descrição: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Anterior"
+
+#~ msgid "New"
+#~ msgstr "Novo"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Nível de Trabalho: %d"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@atacar|Atacar %s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancelar|Cancelar@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@usar|Desequipar@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@usar|Equipar@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@usar|Usar@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@descartar|Descartar@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@dividir|Dividir@@"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "Habilidade Mistério"
+
+#~ msgid "Stats"
+#~ msgstr "Status"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Cost"
+#~ msgstr "Custo"
+
+#~ msgid "Attack:"
+#~ msgstr "Ataque:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflexo:"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Pontos de Status Restantes: %d"
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Conectando ao servidor de contas..."
+
+#~ msgid "Unnamed"
+#~ msgstr "Sem nome"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Rolar radius"
diff --git a/po/ru.po b/po/ru.po
index 8d92a547..413ffcb3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,578 +17,731 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Настройка"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Подключение к серверу карт..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Вход"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Выбор персонажа"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Подключение к серверу карт..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Ошибка"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Пароль:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Сменить"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Удалить регистрацию"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Неизвесная команда"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Помощь --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Отображает этото текст"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Отображает имя карты"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Отображает количество пользователей он-лайн"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Расскажите что-нибудь о себе"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Очищает это окно"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Послать приватное сообщение пользователю"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Вариант команды msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Вариант команды msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Создать или присоединиться к каналу"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "Пригласить пользователя на канал"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "Пригласить пользователя на канал"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Записывать чат во внешний файл"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "Чтобы получить больше информации, наберите /help <команда>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Команда: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Эта команда показывает список доступных команд"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Команда: /help <команда>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Эта команда показывает помощь по <команде>."
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Команда: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "Эта команда очищает лог чата."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Команда: /join <канал>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Эта команда показывает имя текущей карты."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Команда: /join <канал>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "Команда для входа на <канал>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Если <канал> не существует, он будет создан."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "Команда: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "Эта команда показывает список всех каналов."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "Команда: /w <ник> <сообщение>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Команда: /clear"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Команда для входа на <канал>."
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Команда: /join <канал>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Команда: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "Эта команда показывает имя текущей карты."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Команда: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Введите /help для получения списка команд."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Выход"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
+msgstr "Подключение к серверу карт..."
+
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Описание: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Выход"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Продать"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Имя пользователя должно содержать не менее %d символов."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Имя пользователя не должно содержать более %d символов."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Пароль должен содержать не менее %d символов."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Пароль не должен содержать более %d символов."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Цвет волос:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Стрижка:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Создать"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, 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:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Ошибка"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Подтвердите удаление героя"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "ОК"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Предыдущий"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Следующий"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Имя: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Уровень: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Удалить регистрацию"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Новый"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Сменить"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Удалить регистрацию"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Деньги: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr ""
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Закрыть"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -601,180 +754,221 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Соединение..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Снаряжение"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Снять"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Имя: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Эффекты окружающей среды"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Снаряжение"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Снять"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Помощь"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Сбросить"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Сбросить"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "ОК"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Эффект: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr ""
-
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Сменить"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Следующий"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Следующий"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Снять"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -790,325 +984,292 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Торговать с %s@@"
 
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Атака %+d"
 
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Сила волиr:"
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "Rejected invite from %s."
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Торговать с %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Атаковать %s@@"
-
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 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:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Надеть@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Использовать@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Сбросить@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Разделить@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Сменить сервер"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
@@ -1128,137 +1289,182 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Пароль должен содержать не менее %d символов."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Пароль не должен содержать более %d символов."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Сервер:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Порт:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Сервер:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Соединение..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Выборочный курсор"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Выберите сервер"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Настройка"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Применить"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Подключение к серверу карт..."
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Восстановить расположение окон"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Звук"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Громкость музыки"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Применить"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Восстановить расположение окон"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
@@ -1299,430 +1505,598 @@ msgstr "По умолчанию"
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Нейтральное"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Друг"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "выкл"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "низ."
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "выс."
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "средне"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "максимальное"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Выборочный курсор"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Ограничение кадр/с:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Нет"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Умения"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Уровень: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
+
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "Пригласить пользователя на канал"
+
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "Пригласить пользователя на канал"
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Статистика"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Всего"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Стоимость"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Создать персонажа"
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Атака:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "Защита:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Сила"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
+msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "Интеллект"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
+msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Ловкость"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Удача"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Деньги: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Данные персонажа в порядке"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Уровень: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Предложить торговлю"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Вы отдаете:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Сменить"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Имя: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Соединение..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Завершено"
 
@@ -1774,1208 +2148,1447 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Состояние"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Команда: /where"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Эта команда показывает имя текущей карты."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Состояние"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Выберите сервер"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Сменить"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Снаряжение"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Снаряжение"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "/help > Отображает этото текст"
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Подключение к серверу карт..."
-
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Соединение с сервером авторизации..."
-
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Подтвердите удаление героя"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Сила:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Выносливость:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Живучесть:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Интеллект:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Ловкость:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Игроки"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Имя"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Сила"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Выносливость:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Живучесть:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Интеллект"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Ловкость"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Удача"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Сила"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "Интеллект"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Ловкость"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Удача"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Защита:"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Атака:"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Защита:"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "Пригласить пользователя на канал"
+
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "Неизвесная команда"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Удалить регистрацию"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Подключение к серверу карт..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Вы отдаете:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Подтвердите удаление героя"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Данные персонажа в порядке"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Данные персонажа в порядке"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Подтвердите удаление героя"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Сколько предметов продать."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Неизвесная команда"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Сила волиr:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Команда: /join <канал>"
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Неизвесная команда"
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Сила волиr:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Сила волиr:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "Завершено"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2996,20 +3609,56 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "Мана %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Выбор персонажа"
+#~ msgid "Description: %s"
+#~ msgstr "Описание: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Предыдущий"
+
+#~ msgid "New"
+#~ msgstr "Новый"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Атаковать %s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancelОтмена@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Надеть@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Использовать@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Сбросить@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Разделить@@"
+
+#~ msgid "Stats"
+#~ msgstr "Статистика"
+
+#~ msgid "Total"
+#~ msgstr "Всего"
+
+#~ msgid "Cost"
+#~ msgstr "Стоимость"
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Соединение с сервером авторизации..."
 
 #~ msgid "Scroll radius"
 #~ msgstr "Радиус прокрутки"
diff --git a/po/sk.po b/po/sk.po
index 27ddbcbe..3f216267 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-04-07 18:10+0000\n"
 "Last-Translator: Dalanos <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -17,579 +17,727 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Nastavenie"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Pripájam sa..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Prihlásenie"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Vyberte postavu"
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Chyba"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Heslo:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+msgid "Email Change"
+msgstr ""
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Zrušiť registráciu"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Neznámy príkaz."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Pomoc --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "Pre viac informácií, napíšte /help <príkaz>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Príkaz: /hel"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 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:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Príkaz: /help <príkaz>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Tento príkaz zobrazí nápovedu pre <príkaz>."
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Príkaz: /announce <správa>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** prístupné iba pre GM ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 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:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Príkaz: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 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:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Príkaz: /announce <správa>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 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:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Príkaz: /clear"
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Príkaz: /announce <správa>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Príkaz: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "Tento príkaz zobrazí meno aktuálne mapy."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Príkaz: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 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:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Napíš /help pre zoznam príkazov."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-#, fuzzy
-msgid "Could not load map"
-msgstr "Nie je možné  vstúpiť do párty!"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Ukončiť"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Nie je možné  vstúpiť do párty!"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Popis: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Effekt: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Ukončiť"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Predaj"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Zmeniť Emailovú adresu"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Účet: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Heslo musí byť menšie %d ako písmen."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Heslo musí byť menšie %d ako písmen."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Heslo:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Heslo musí byť menšie %d ako písmen."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Heslo musí byť menšie %d ako písmen."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Vytvoriť postavu"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Meno"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Farba vlasov:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Štýl vlasov:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Chyba"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Potvrďte zmazanie postavy"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Účet a správa postáv"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Potvrdiť"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Predchádzajúci"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Nasledujúci"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Meno: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Level: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Zrušiť registráciu"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Nový"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Zmeniť Emailovú adresu"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Zrušiť registráciu"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Peniaze: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "Pracovná úroveň: %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Zatvoriť"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:327
-msgid "Present: "
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -602,182 +750,224 @@ msgstr "Áno"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Pripájam sa..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Vybavenie"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Odstrojiť"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Meno: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Účet: %s"
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Vybavenie"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Odstrojiť"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Nápoveda"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventár"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Vystrojiť"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Použiť"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Zahodiť"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ano"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Zahodiť"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "Potvrdiť"
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Effekt: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Server:"
-
-#: 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/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Zapamätať si používateľské meno"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrovať"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Vyberte Server"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "MiniMapa"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Nasledujúci"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "Ukončiť"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Nasledujúci"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Odstrojiť"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -793,328 +983,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "Stav"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "Použiť"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "Schopnosti"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
 msgstr "@@obchod|Obchodovať s %s@@"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
 msgstr "@@útok|Útok %s@@"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Nápoveda pre %s: %s"
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:133
+#, c-format
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 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:165
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@použiť|Odstrojiť@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
+#: src/gui/popupmenu.cpp:191
+#, c-format
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
@@ -1134,135 +1291,179 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Heslo musí byť menšie %d ako písmen."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Pripájam sa..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
 msgstr "Vyberte Server"
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Nastavenie"
+#: src/gui/serverdialog.cpp:262
+msgid "Please type both the address and the port of a server."
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Použiť"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Sfx zvuk"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Hudobný zvuk"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Použiť"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1305,432 +1506,596 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "Predaj"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Nie"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Schopnosti"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Schopnosti"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Level: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Level: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Naozaj chcete odstrániť túto postavu?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Naozaj chcete odstrániť túto postavu?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Vytvoriť postavu"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Vytvorenie postavy sa nepodarilo"
+
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/trade.cpp:51
-msgid "Propose trade"
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Level: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Peniaze: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Potvrďte zmazanie postavy"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Level: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
 #: src/gui/trade.cpp:52
-msgid "Confirmed. Waiting..."
+msgid "Propose trade"
 msgstr ""
 
 #: src/gui/trade.cpp:53
-msgid "Agree trade"
+msgid "Confirmed. Waiting..."
 msgstr ""
 
 #: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 #, fuzzy
 msgid "You don't have enough money."
 msgstr "Nemáš žiadne poznámky!"
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Meno: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Pripájam sa..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1782,1209 +2147,1437 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Globálne oznámenie:"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globálne oznámenie od %s:"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
-msgstr ""
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "Nápoveda pre %s: %s"
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Stav"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Príkaz: /where"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Stav"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Skratka"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Vyberte Server"
+
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Vybavenie"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Vybavenie"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Potvrďte zmazanie postavy"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Sila:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Meno"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Sila:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligencia:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Vymazať"
+
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Tento príkaz zobrazí meno aktuálne mapy."
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "Neznámy príkaz."
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Zrušiť registráciu"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "Zmeniť heslo"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Obchod sa nepodaril!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Zobrazenie smajlíka sa nepodarilo!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Sadnutie sa nepodarilo!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Nie je možné  vstúpiť do párty!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Nemôžem kričať!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Ešte si nedosiahol dostatočne vysokú úroveť!"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "Nedostatok HP!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "Nedostatok SP!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Nemáš žiadne poznámky!"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Práve teraz to nemôžeš robiť."
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Potrebuješ ďaľší červený gem!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Potrebuješ ďaľší modrý gem!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Nosíš veľa, aby si mohol spraviť toto!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "Heh? Čo to je?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "Warp sa nepodaril ..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Nedá sa kradnúť ..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Jed nemá žiaden účinnok ..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Potvrďte zmazanie postavy"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Potvrďte zmazanie postavy"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Zvoľte množstvo vecí k predaju."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Neznámy príkaz."
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Neznámy príkaz."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 #, fuzzy
 msgid "Error creating guild."
 msgstr "Vytvorenie postavy sa nepodarilo"
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3005,17 +3598,32 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Vyberte postavu"
+#~ msgid "Description: %s"
+#~ msgstr "Popis: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Predchádzajúci"
+
+#~ msgid "New"
+#~ msgstr "Nový"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Pracovná úroveň: %d"
+
+#~ msgid "Ok"
+#~ msgstr "Ano"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@zrušiť|Zrušiť@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@použiť|Odstrojiť@@"
diff --git a/po/sv.po b/po/sv.po
index 87eab448..ca45f0bb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-06-02 14:28+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -17,203 +17,319 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-06-08 19:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Inställningar"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Ansluter till kartservern..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Användarnamn"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Välj karaktär"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Ansluter till kartservern..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Fel"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Lösenord:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Ändra"
+
+#: src/client.cpp:863
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "Medlem befordrad."
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Avregistrera"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "Ogiltig uppdateringsvärd: "
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "Kunde inte skapa katalog för uppdateringar!"
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Hjälp --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Visa den här hjälpen"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Visa kartans namn"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Visa antalet inloggade spelare"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Säg något om dig själv"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Tömmer det här fönstret"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Skickar ett privat meddelande till en spelare"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Alias för msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Alias för msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 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:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > Alias för query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > Visa alla offentliga chattkanaler"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Gå med i eller skapa en chattkanal"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Skapa ny grupp"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 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:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Avgör huruvida <retur> aktiverar chattfönstret eller ej"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 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:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globalt meddelande (endast för GM)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr "Skriv /help <kommando> för mer information."
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 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:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Det här kommandot ger mer information om <kommando>."
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <text>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** endast en GM kan använda det här kommandot ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 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:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "Det här kommandot tömmer chattloggen."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Kommando: /item <alternativ>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Kommando: /join <chattkanal>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "Det här kommandot låter dig gå in i <chattkanal>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Om <chattkanal> inte existerar, skapas den."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "Kommando: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "Det här kommandot visar en lista över alla chattkanaler."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "Kommando: /me <meddelande>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 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:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "Kommando: /msg <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "Kommando: /whisper <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "Kommando: /w <spelare> <meddelande>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "Det här kommandot skickar <meddelande> till <spelare>."
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 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:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "Kommando: /query <spelare>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "Kommando: /q <spelare>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 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:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Kommando: /create <grupp>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Dessa kommandon skapar <grupp>."
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "Kommando: /party <spelare>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Det här kommandot bjuder in <spelare> till din grupp."
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "Kommando: /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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,27 +337,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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "Kommando: /record <filnamn>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 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:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "Kommando: /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr "Det här kommandot slutar loggning av chatten."
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "Kommando: /toggle <tillstånd>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -249,7 +365,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:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -257,39 +373,48 @@ 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "Kommando: /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 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:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Kommando: /item <alternativ>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Kommando: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 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:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 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:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help för en lista med kommandon."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "Behöver en text att viska!"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -298,312 +423,349 @@ msgstr ""
 "Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar "
 "fliken redan eller så försöker du viska till dig själv."
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Du måste ange gruppens namn."
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "Retur visar/döljer chattfönstret."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "Meddelande stänger chattfönstret."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "Grupp skapad."
+
+#: src/commandhandler.cpp:486
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "Kunde inte viska eftersom ignorerad av spelaren."
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
 
-#: src/engine.cpp:88
-msgid "Could not load map"
-msgstr "Kunde inte ladda karta"
-
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
-msgstr "Kunde inte ladda %s"
-
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "Skärmbild sparades till ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr ""
 "Förbindelsen till servern förlorades, programmet kommer nu att avslutas."
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Avsluta"
-
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "Är du säker på att du vill avsluta?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr "nej"
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "Kompis"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Kunde inte ladda karta"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "Kompislista"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
+msgstr "Kunde inte ladda %s"
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Grupp (%s)"
+
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
-msgstr "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Beskrivning: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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 "Effekt: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Avsluta"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr "Max"
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Affär"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Sälj"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Ändra epostadress"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Konto: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
 msgstr "Ange den nya epostadressen två gånger:"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Användarnamnet måste vara minst %d tecken långt."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Användarnamnet måste vara kortare än %d tecken."
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "Den nya epostadressen används redan."
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "Ange det nya lösenordet två gånger:"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Lösenordet måste vara minst %d tecken långt."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Lösenordet måste vara kortare än %d tecken."
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "Ange det nya lösenordet två gånger:"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Hårfärg:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Frisyr:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Skapa"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Man"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Kvinna"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Var vänlig fördela %d poäng"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Fel"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Karaktärens värden okej"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Bekräfta borttagning av karaktär"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "Hantering av konto och karaktärer"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Okej"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Föregående"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Nästa"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Namn: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Nivå: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Avregistrera"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Ny"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Ändra epostadress"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Avregistrera"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Pengar: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "Jobbnivå: %d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Stäng"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "Pengar: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "%d spelare är närvarande."
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "Närvarande: "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "Närvaro loggades till fil."
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -616,182 +778,224 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Ansluter..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Utrustning"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Avrusta"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
-msgstr "Gille"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "Ämne: %s"
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
-msgstr "Skapa gille"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Namn: %s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
-msgstr "Bjud in spelare"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "Minikarta"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Partikeleffekter"
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
-msgstr "Lämna gille"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Partikeldetaljer"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Omgivande FX"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Utrustning"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Avrusta"
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Släpp"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "Utrymme:"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Släpp"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
 msgstr "Okej"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "Alla"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "Välj antal att lagra."
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal att hämta."
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "Vikt: "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr "Senaste:"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr "Magi"
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr "Använd testmagi 1"
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr "Använd testmagi 2"
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr "Använd testmagi 3"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Server"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "Karta"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "Väntar på server"
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Nästa"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr "Vidare"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Nästa"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr "Till:"
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "Skicka"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 "Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är "
 "ogiltigt."
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Avrusta"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "Text"
 
@@ -807,325 +1011,302 @@ msgstr "Textkontur"
 msgid "Progress Bar Labels"
 msgstr "Förloppsindikatoretiketter"
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "Bakgrund"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr "Markering"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr "Flikmarkering"
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+#, fuzzy
+msgid "Item Too Expensive"
 msgstr "Den är för dyr"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+#, fuzzy
+msgid "Item Is Equipped"
 msgstr "Du har utrustat dig"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "GM"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "Spelare"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "Viskning"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "Är"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr "Grupp"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gille"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr "Server"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "Loggning"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "Länk"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr "Varelse"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "Andra spelares namn"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "Eget namn"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "GM-namn"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "NPC:er"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr "Okänt föremålsslag"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr "Allmänna föremål"
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr "Huvudbonader"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr "Förbrukningsvaror"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr "Tröjor"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+#, fuzzy
+msgid "One Handed Weapons"
 msgstr "Enhandsvapen"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "Byxor"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "Skor"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
-msgstr "Tvåhandsvapen"
+#: src/gui/palette.cpp:122
+#, fuzzy
+msgid "Two Handed Weapons"
+msgstr "Enhandsvapen"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr "Sköldar"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "Ringar"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr "Halsband"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr "Handskar"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "Ammunition"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr "Upplocksnotis"
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr "XP-notifiering"
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+#, fuzzy
+msgid "Player Hits Monster"
 msgstr "Spelare slår monster"
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+#, fuzzy
+msgid "Monster Hits Player"
 msgstr "Monster slår spelare"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr "Kritisk träff"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr "Missar"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr "Full hälsostapel"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr "Trekvarts hälsostapel"
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr "Halv hälsostapel"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr "Kvarts hälsostapel"
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr "Grupp (%s)"
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s har bjudit in dig till sin grupp."
-
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s har bjudit in dig till %ss grupp."
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr "Acceptera gruppinbjudan"
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr "Accepterade injudan från %s."
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr "Avslog inbjudan från %s."
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Använd namn i chatt@@"
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Byteshandlar med %s"
 
-#: 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:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Attack %+d"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Attackera %s@@"
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Viskning"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+#: src/gui/popupmenu.cpp:101
+#, fuzzy, c-format
+msgid "Befriend %s"
 msgstr "@@friend|Lägg till %s som vän@@"
 
-#: src/gui/popupmenu.cpp:99
-#, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|Strunta i %s@@"
+#: src/gui/popupmenu.cpp:106
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Förbisedd"
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore|Ignorera %s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "Ignorerad"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
-msgstr "@@unignore|Sluta ignorera %s@@"
+msgid "Unignore %s"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:118
+#, fuzzy, c-format
+msgid "Completely ignore %s"
 msgstr "@@ignore|Ignorera %s fullständigt@@"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
 msgstr "@@guild|Bjud in %s till ditt gille@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|Bjud in %s till din grupp@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Sparka spelare@@"
+#: src/gui/popupmenu.cpp:144
+#, fuzzy
+msgid "Kick player"
+msgstr "Kunde inte sparka ut!"
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:153
+#, fuzzy, c-format
+msgid "Talk to %s"
 msgstr "@@talk|Prata med %s@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+#, fuzzy
+msgid "Kick monster"
 msgstr "@@admin-kick|Sparka monster@@"
 
-#: 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:174
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|Använd namn i chatt@@"
 
-#: src/gui/popupmenu.cpp:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Plocka upp %s@@"
+#: src/gui/popupmenu.cpp:191
+#, fuzzy, c-format
+msgid "Pick up %s"
+msgstr "Plocka upp"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#, fuzzy
+msgid "Add to chat"
 msgstr "@@chat|Nämn i chattfönstret@@"
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@use|Avrusta@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Utrusta@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Använd@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Släpp@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Dela@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
-msgstr "@@store|Lager@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr "Lagra"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|Hämta@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
+msgstr "Hämta"
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Byt server"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Byt karaktär"
 
@@ -1145,137 +1326,189 @@ msgstr "Loggar chattmeddelanden till fil."
 msgid "Starting to record..."
 msgstr "Börjar logga chattmeddelanden…"
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr "Misslyckades att börja logga chattmeddelanden."
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr "Loggar chattmeddelanden…"
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr "Sluta logga chattmeddelanden"
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "E-post:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lösenordet måste vara kortare än %d tecken."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+#, fuzzy
+msgid "Choose Your Server"
 msgstr "Välj din server"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Ansluter..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Särskild muspekare"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Var vänlig skriv både adressen och porten till en server."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Välj server"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Inställningar"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Verkställ"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Väntar på server"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Återställ fönster"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Ljud"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Ingen text"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "Färger"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+#, fuzzy
+msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr "Statisk"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "Pulserande"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "Regnbåge"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
 msgstr "Fördröjning: "
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+#, fuzzy
+msgid "Red:"
 msgstr "Röd: "
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
 msgstr "Grön: "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+#, fuzzy
+msgid "Blue:"
 msgstr "Blå: "
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Verkställ"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Återställ fönster"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
@@ -1316,432 +1549,623 @@ msgstr "Förval"
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Namn"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Vän"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "Förbisedd"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "Ignorerad"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr "Visa alla viskningar i egna flikar"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "Visa namn"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Spelare"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr "Pytteliten"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "Liten"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "Mellan"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr "Stor"
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr "Ingen text"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "Textbubblor utan namn"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr "Textbubblor med namn"
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "av"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "låg"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "hög"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "medium"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "maximal"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "Synliga namn"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+#, fuzzy
+msgid "Show own name"
 msgstr "Visa namn"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr "Visa erhållna saker"
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr "i chattfönster"
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr "som partikel"
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS-gräns:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "Visa namn"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr "Text ovanför huvudet"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Genomskinlighet"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Omgivande FX"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "Partikeldetaljer"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr "Typsnittsgrad"
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "Kunde inte byta till "
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "fönster"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Nej"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
-msgstr "helskärms"
+#: src/gui/setup_video.cpp:381
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "läge och återgång till det gamla läget misslyckades också!"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Byte till helskärm"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Ändrar OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_video.cpp:522
+#, fuzzy
+msgid "Particle Effect Settings Changed."
 msgstr "Inställningar för partikeleffekter ändrade."
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:523
 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:53
-msgid "Mystery Skill"
-msgstr "Mystisk förmåga"
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: 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:149
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "Upp"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
-msgstr "Vapen"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Färdighetspoäng: %d"
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
-msgstr "Hantverk"
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Färdighetspoäng: %d"
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Färdigheter"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Nivå: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Nivå: %d"
+
+#: src/gui/socialwindow.cpp:117
 #, c-format
-msgid "Job: %d"
-msgstr "Jobb: %d"
+msgid "Invited user %s to guild %s."
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
-msgstr "HP:"
+#: src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gille skapat."
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
-msgstr "EP:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
-msgstr "MP:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
-msgstr "Jobb:"
+#: src/gui/socialwindow.cpp:146
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "Skapa gille"
+
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Är du säker på att du vill avsluta?"
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Statistik"
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Totalt"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Kostnad"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > Bjud in en spelare till din grupp"
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Attack:"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "Försvar:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "M. attack:"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Är du säker på att du vill avsluta?"
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "M. försvar:"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "Skapa gille"
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Träffsäkerhet:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Skapa karaktär"
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% Reflexer:"
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "Bjud in spelare"
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Styrka"
+#: src/gui/socialwindow.cpp:298
+#, fuzzy
+msgid "Leave"
+msgstr "Stor"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "Smidighet"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Accepterade injudan från %s."
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "Hälsa"
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Avslog inbjudan från %s."
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "Intelligens"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "Accepterade injudan från %s."
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Skicklighet"
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "Avslog inbjudan från %s."
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Tur"
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "Kunde inte skapa gille."
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "Återstående statuspoäng: %d"
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
-msgstr "Maxnivå"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "Gille"
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
-msgstr "Lagring"
+#: src/gui/socialwindow.cpp:485
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "Välj din server"
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
-msgstr "Lagra"
+#: src/gui/socialwindow.cpp:497
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
-msgstr "Hämta"
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s har bjudit in dig till %ss grupp."
+
+#: src/gui/socialwindow.cpp:507
+#, fuzzy
+msgid "Accept Guild Invite"
+msgstr "Acceptera gruppinbjudan"
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
+
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s har bjudit in dig till sin grupp."
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/trade.cpp:51
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s har bjudit in dig till sin grupp."
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s har bjudit in dig till %ss grupp."
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr "Acceptera gruppinbjudan"
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+#, fuzzy
+msgid "Party Name"
+msgstr "Grupp"
+
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Välj din server"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Nivå: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "Pengar: %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr "HP:"
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr "EP:"
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr "MP:"
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "Jobb: %d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr "Jobb:"
+
+#: src/gui/statuswindow.cpp:194
+#, fuzzy
+msgid "HP"
+msgstr "HP:"
+
+#: src/gui/statuswindow.cpp:200
+#, fuzzy
+msgid "MP"
+msgstr "MP:"
+
+#: src/gui/statuswindow.cpp:206
+#, fuzzy
+msgid "Exp"
+msgstr "EP:"
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Pengar: %d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "Jobb:"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Karaktärens värden okej"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Färdighetspoäng: %d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Nivå: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr "Lagring"
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Föreslå handel"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr "Bekräftat. Väntar…"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr "Godkänn handel"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr "Godkänt. Väntar…"
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "Byteshandel: du"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
 msgstr "Du får %s."
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Ändra"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
 "sak flera gånger."
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Namn: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Ansluter..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Spela"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "curl-fel "
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " värd: "
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "##1  du försöker igen senare"
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Färdig"
 
@@ -1794,638 +2218,745 @@ msgstr "Det här kommandot gör att du lämnar aktuell chattkanal."
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "Om du är den sista spelaren i chattkanalen tas den bort."
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "Kommando: /op <spelare>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr "Det här kommandot gör <spelare> till chattkanalsoperatör."
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "Operatörer kan sparka ut och ge operatörsstatus till andra spelare i "
 "chattkanalen."
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "Kommando: /kick <spelare>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr "Det här kommandot sparkar ut <spelare> ur chattkanalen."
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "Du måste ange vilken spelare som ska få operatörsstatus!"
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr "Du måste ange vilken spelare som ska sparkas ut!"
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "Globalt meddelande:"
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globalt meddelande från %s:"
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
 msgstr "%s viskar: "
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr "Kan inte skicka ett tomt chattmeddelande!"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr "/close > Stänger viskningsfliken"
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr "Kommando: /close"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr "Det här kommandot stänger aktuell viskningsflik."
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Status"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Kommando: /item"
+
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "Gillen"
+#: src/gui/widgets/whispertab.cpp:94
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Det här kommandot startar loggning av chatten till <filnamn>."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr "Kompisar"
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Status"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Genvägar"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Välj okej"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Ändra"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Välj din server"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr "Gå uppåt"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr "Gå nedåt"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr "Gå åt vänster"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr "Gå åt höger"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr "Attackera"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr "Välj & attackera"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr "Smiley"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr "Prata"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr "Sluta attackera"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
 msgstr "Välj närmaste"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr "Välj NPC"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr "Välj spelare"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr "Plocka upp"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr "Dölj fönster"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr "Sitt"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr "Tillåt/neka handel"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr "Gå till muspekaren"
 
-#: 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
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tangent för snabbåtkomst %d"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr "Hjälpfönster"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr "Statusfönster"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr "Inventorium"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr "Utrustningsfönster"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr "Färdighetsfönster"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr "Minikarta"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr "Chattfönster"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr "Snabbåtkomstfönster"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr "Inställningsfönster"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr "Gruppfönster"
+#: src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Social Window"
+msgstr "Färdighetsfönster"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr "Smileyfönster"
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Statusfönster"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Tangent för smiley %d"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr "Växla chattfönster"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr "Rulla upp chatt"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr "Rulla ned chatt"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr "Föregående chattflik"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr "Välj okej"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr "Ignorera inmatning 1"
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr "Ignorera inmatning 2"
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr "Obeväpnad"
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr "Kniv"
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr "Svärd"
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr "Spjut"
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr "Stav"
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr "Piska"
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr "Båge"
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr "Skjutvapen"
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr "Spikklubba"
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr "Yxa"
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr "Kastvapen"
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr "Hantverk"
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr "Okänd förmåga"
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr "Ogiltig uppdateringsvärd: "
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr "Kunde inte skapa katalog för uppdateringar!"
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr " kan inte skapas och existerar inte! Avslutar."
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "Kunde inte välja "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
+msgstr "Kunde inte plocka upp."
 
-#: src/main.cpp:493
-msgid " video mode: "
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
+msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
+
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:575
-msgid "mana"
-msgstr "mana"
-
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr "Alternativ:"
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr "  -C --config-file : Konfigurationsfil att använda"
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr "  -d --data        : Katalog att hämta speldata från"
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr "  -D --default     : Välj förvald karaktärsserver och karaktär"
+#: src/main.cpp:45
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version     : Visa aktuell version"
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
 msgstr "  -h --help        : Visa den här hjälpen"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
-msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
+#: src/main.cpp:47
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : Konfigurationsfil att använda"
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
-msgstr "  -H --update-host : Använd den här uppdateringsvärden"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username    : Logga in med det här användarnamnet"
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password    : Logga in med det här lösenordet"
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -c --character      : Login with this character"
 msgstr "  -c --character   : Logga in med den här karaktären"
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
-msgstr "  -p --port        : Port på inloggningsserver"
-
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:51
+#, fuzzy
+msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server      : Namn eller IP-adress för inloggningsserver"
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
-msgstr "  -u --skip-update : Ladda inte ner uppdateringar"
+#: src/main.cpp:52
+#, fuzzy
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port        : Port på inloggningsserver"
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
-msgstr "  -U --username    : Logga in med det här användarnamnet"
+#: src/main.cpp:53
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : Använd den här uppdateringsvärden"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
-msgstr "  -O --no-opengl   : Använd inte OpenGL den här sessionen"
+#: src/main.cpp:54
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default     : Välj förvald karaktärsserver och karaktär"
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
-msgstr "  -v --version     : Visa aktuell version"
+#: src/main.cpp:56
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : Ladda inte ner uppdateringar"
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Ansluter till kartservern..."
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data        : Katalog att hämta speldata från"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "Ansluter till karaktärsservern..."
+#: src/main.cpp:58
+#, fuzzy
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
+
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir    : Katalog att använda som hemkatalog"
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Ansluter till kontoservern..."
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl   : Använd inte OpenGL den här sessionen"
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr "Kunde inte sparka ut!"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr "Klarade av att sparka ut!"
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr "Inget att sälja."
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr "Tack för köpet."
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr "Kan inte köpa."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr "Tack för en god affär."
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr "Kan inte sälja."
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+#, fuzzy
+msgid "Access denied."
 msgstr "Tillträde nekat"
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
 msgstr "Kan inte använda ID"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown failure to select character."
 msgstr "Kunde inte välja karaktär av okänd anledning"
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan inte skapa karaktär. Troligtvis används namnet av någon annan."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr "Information"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr "Karaktär borttagen."
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr "Kunde inte ta bort karaktär."
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Styrka:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Smidighet:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Hälsa:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Intelligens:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Skicklighet:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr "Tur:"
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr "Kunde inte viska eftersom spelaren inte är inloggad."
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr "Kunde inte viska eftersom ignorerad av spelaren."
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Spelare"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr "Chattkanaler stöds inte!"
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
-msgstr "Kan inte utrusta."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr "Kan inte avrusta."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Namn"
+
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Förfrågan om byteshandel"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "Styrka %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "Livskraft %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Tur %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
 msgstr "Behörighetskontroll misslyckades"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
 msgstr "Ingen server är tillgänglig"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+#, fuzzy
+msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker att använda det här kontot"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+#, fuzzy
+msgid "This account is already logged in."
 msgstr "Det här kontot är redan inloggat"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+#, fuzzy
+msgid "Speed hack detected."
 msgstr "Ett hastighetshack har upptäckts"
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+#, fuzzy
+msgid "Duplicated login."
 msgstr "Dubbel inloggning"
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Styrka"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "Smidighet"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "Hälsa"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "Intelligens"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Skicklighet"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Tur"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Försvar:"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "M. attack:"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "M. försvar:"
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Träffsäkerhet:"
+
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "Kritisk träff"
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > Visa den här hjälpen"
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
-msgstr "/create > Skapa ny grupp"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Bjud in en spelare till din grupp"
+
+#: src/net/ea/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Lämna gruppen du är i"
+
+#: src/net/ea/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Sparka ut någon från din grupp"
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Kommando: /invite <spelare>"
+
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Det här kommandot bjuder in <spelare> till din grupp."
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Kommando: /leave"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Det här kommandot får spelaren att lämna gruppen."
+
+#: src/net/ea/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "Du måste ange gruppens namn."
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
-msgstr "/new > Alias för /create"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s är nu en medlem i din grupp."
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Okänt injudningssvar från %s."
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Bjud in en spelare till din grupp"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Lämna gruppen du är i"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Sparka ut någon från din grupp"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Visa/ändra delningsalternativ för upplock inom gruppen"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Visa/ändra hur erfarenhet fördelas i gruppen"
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
-msgstr "Kommando: /new <grupp>"
-
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
-msgstr "Kommando: /create <grupp>"
-
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
-msgstr "Dessa kommandon skapar <grupp>."
-
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
-msgstr "Kommando: /invite <spelare>"
-
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
-msgstr "Kommando: /leave"
-
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Det här kommandot får spelaren att lämna gruppen."
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "Kommando: /item <alternativ>"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Det här kommandot ändrar huruvida gruppen ska kunna plocka upp efter alla."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2435,23 +2966,23 @@ msgstr ""
 "efter alla gruppmedlemmar), eller ”0”, ”no” eller ”false” för att inte dela "
 "på upplocken."
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "Kommando: /item"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "Det här kommandot visar huruvida gruppen kan plocka upp efter alla."
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "Kommando: /exp <alternativ>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "Det här kommandot ändrar hur erfarenhet fördelas inom gruppen."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2460,102 +2991,109 @@ msgstr ""
 "delning av erfarenhet, eller ”0”, ”no” eller ”false” för att inte dela på "
 "erfarenhet."
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "Kommando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Det här kommandot visar om erfarenhet delas inom gruppen."
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr "Du måste ange gruppens namn."
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr "Upplocksdelning aktiverad."
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr "Upplocksdelning avaktiverad."
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr "Upplocksdelning är inte möjligt."
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Upplocksdelning aktiverad."
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr "Fördelning av erfarenhet aktiverad."
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr "Fördelning av erfarenhet inaktiverad."
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr "Fördelning av erfarenhet ej möjlig."
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
-msgstr "Kunde inte plocka upp."
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
-msgstr "en"
-
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "Du plockade upp %s [@@%d|%s@@]."
+#: src/net/ea/gui/partytab.cpp:176
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Fördelning av erfarenhet aktiverad."
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:281
 msgid "Failed to use item."
 msgstr "Kunde inte använda föremål."
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
+msgstr "Kan inte utrusta."
+
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr "Kan inte avrusta."
+
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr "Kontot kunde inte hittas. Var vänlig att logga in på nytt."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
 msgstr "Det gamla lösenordet är fel"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+#, fuzzy
+msgid "New password too short."
 msgstr "Det nya lösenordet är för kort"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
 msgstr "Okänt fel"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
 msgstr "Oregistrerat ID"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
 msgstr "Fel lösenord"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+#, fuzzy
+msgid "Account expired."
 msgstr "Konto raderat"
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
 msgstr "Nekad tillträde till servern"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
+#, fuzzy
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du har permanent blivit bannlyst från spelet. Kontakta en GM."
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2564,88 +3102,107 @@ msgstr ""
 "Du har tillfälligt blivit utkastat från spelet till %s.\n"
 "Var vänlig kontakta en GM i forumet."
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
 msgstr "Det här användarnamnet finns redan"
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "Kan inte sälja."
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Ansluter till kartservern..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Kunde inte skapa grupp."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "Grupp skapad."
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s är redan medlem i en grupp."
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s avvisade din inbjudan."
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, 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:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Okänt injudningssvar från %s."
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr "Du har lämnat gruppen."
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr "%s har lämnat din grupp."
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, 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:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 "För tillfället är det inte möjligt att bjuda in något på det här viset."
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s är inte med i din grupp!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "Du är död."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "Du är inte så värst levande längre."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Liemannens svala händer sträcker sig efter din själ."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "Spelet är slut!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr "Stoppa i mynt för att fortsätta."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2653,7 +3210,7 @@ msgstr ""
 "Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre "
 "ställe."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2661,360 +3218,527 @@ msgstr ""
 "Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals "
 "misslyckades."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "Jag antar att det kunde gått bättre."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "Vill du att dina tillhörigheter ska identifieras?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "Tillintetgjord."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "Verkar som att som att någon gav dig ditt huvud."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en "
 "ny."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "Du är inte död än. Du vilar bara."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "Du finns inte längre."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "Du har slutat att existera."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "Du är passé och har givit dig av för att träffa din skapare."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "Du är en steling."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "Berövad på ditt liv vilar du numera i frid."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Om du inte vore så livfull skulle du vara blomnäring vid det här laget."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "Dina metaboliska processer är nu historia."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr "Du har trillat av pinn."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "Du har kastat in handduken."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "Du tog ner skylten, kilade runt hörnet och bet i gräset."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "Du är en före detta spelare."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr "Du har gått till de sälla jaktmarkerna."
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 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:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "Du plockade upp "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr "Utrusta dig med pilar först."
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Byteshandel misslyckades!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Kan inte visa smiley!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Kan inte sitta!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Kan inte skicka chattmeddelande!"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Kan inte ansluta till gruppen!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Kan inte skrika!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 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:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "Otillräckligt med HP!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "Otillräckligt med SP!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Du har inga anteckningar!"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer pengar… ;-)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 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:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd juvel!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå juvel!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 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:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "Öh? Vad är det där?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "Kartförflyttning misslyckades..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Kunde inte stjäla något..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Giftet tog inte..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr "Förfrågan om byteshandel"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill byteshandla med dig, accepterar du?"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 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:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Byteshandel är inte möjligt. Karaktären existerar inte."
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Byteshandel avbröts av okänd anledning."
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Byteshandel: du och %s"
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Byteshandel med %s avbruten."
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr "Ett okänt paket för att avbryta byteshandeln påträffades."
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Kunde inte lägga till föremål. Bytespartnern är överfull."
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "Kunde inte lägga till föremål. Bytespartnern har inget ledigt utrymme."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "Kunde inte lägga till föremål av okänd anledning."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "Byteshandel avbruten."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "Byteshandel genomförd."
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "Press OK to respawn."
 msgstr " Klicka okej för att återuppstå"
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
 msgstr "Du dog"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "Redan inloggad"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Användarnamnet finns redan"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Karaktärens värden okej"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Karaktärens värden okej"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Karaktär borttagen."
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Välj antal föremål att handla med."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Okänt fel"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "Ingen spelserver finns tillgänglig."
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Viljestyrka:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr "Ämne: %s"
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "Spelare slår monster"
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Kommando: /join <chattkanal>"
+
+#: src/net/manaserv/chathandler.cpp:207
+#, fuzzy
+msgid "Listing channels."
+msgstr "Skickar förfrågan att gå in i chattkanalen %s."
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, fuzzy, c-format
+msgid "%s entered the channel."
+msgstr "%s anslöt sig till gruppen."
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Okänt kommando."
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "Viljekraft %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Viljestyrka:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr "Gille skapat."
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr "Kunde inte skapa gille."
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr "Inbjudan skickad."
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr "Medlem befordrad."
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr "Kunde inte befordra medlem."
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
 msgstr "Fel magic_token"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "Redan inloggad"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "Servern är full"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "Det nya lösenordet stämmer inte överens"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "Kontot är inte anslutet. Var god logga in först."
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "Den nya epostadressen är felaktig."
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "Den gamla epostadressen är fel."
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "Den nya epostadressen används redan."
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "Du har en för gammal version av klienten"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "Felaktigt användarnamn eller lösenord"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "Felaktigt användarnamn, lösenord eller epostadress"
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "Användarnamnet finns redan"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "Epostadressen finns redan"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr "Anslöt dig till grupp."
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr "%s anslöt sig till gruppen."
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s avvisade din inbjudan."
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr "Accepterar byteshandelsförfrågningar."
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorerar byteshandelsförfrågningar."
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr "Byteshandlar med %s"
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|Ignorera %s fullständigt@@"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3035,23 +3759,233 @@ msgstr "Hälsa %+d"
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr "Okänt föremål"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "Namnlös"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "namnlös"
 
-#~ msgid "Select Character"
-#~ msgstr "Välj karaktär"
+#~ msgid "no"
+#~ msgstr "nej"
+
+#~ msgid "Buddy"
+#~ msgstr "Kompis"
+
+#~ msgid "Buddy List"
+#~ msgstr "Kompislista"
+
+#~ msgid "Description: %s"
+#~ msgstr "Beskrivning: %s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "Effekt: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Föregående"
+
+#~ msgid "New"
+#~ msgstr "Ny"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Jobbnivå: %d"
+
+#~ msgid "Present: "
+#~ msgstr "Närvarande: "
+
+#~ msgid "Quit Guild"
+#~ msgstr "Lämna gille"
+
+#~ msgid "Ok"
+#~ msgstr "Okej"
+
+#~ msgid "Recent:"
+#~ msgstr "Senaste:"
+
+#~ msgid "Magic"
+#~ msgstr "Magi"
+
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Använd testmagi 1"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Använd testmagi 2"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Använd testmagi 3"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Tvåhandsvapen"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Handla med %s@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attackera %s@@"
+
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Strunta i %s@@"
+
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorera %s@@"
+
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Sluta ignorera %s@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Sparka spelare@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Avbryt@@"
+
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Plocka upp %s@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Avrusta@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Utrusta@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Använd@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Släpp@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dela@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Lager@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Hämta@@"
+
+#~ msgid "Select Server"
+#~ msgstr "Välj server"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "Kunde inte byta till "
 
-#~ msgid "MiniMap"
-#~ msgstr "Minikarta"
+#~ msgid "windowed"
+#~ msgstr "fönster"
+
+#~ msgid "fullscreen"
+#~ msgstr "helskärms"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "Mystisk förmåga"
+
+#~ msgid "Weapons"
+#~ msgstr "Vapen"
+
+#~ msgid "Crafts"
+#~ msgstr "Hantverk"
+
+#~ msgid "Stats"
+#~ msgstr "Statistik"
+
+#~ msgid "Total"
+#~ msgstr "Totalt"
+
+#~ msgid "Cost"
+#~ msgstr "Kostnad"
+
+#~ msgid "Attack:"
+#~ msgstr "Attack:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflexer:"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Återstående statuspoäng: %d"
+
+#~ msgid "Max level"
+#~ msgstr "Maxnivå"
+
+#~ msgid "curl error "
+#~ msgstr "curl-fel "
+
+#~ msgid " host: "
+#~ msgstr " värd: "
+
+#~ msgid "Guilds"
+#~ msgstr "Gillen"
+
+#~ msgid "Buddys"
+#~ msgstr "Kompisar"
+
+#~ msgid "Party Window"
+#~ msgstr "Gruppfönster"
+
+#~ msgid "Unarmed"
+#~ msgstr "Obeväpnad"
+
+#~ msgid "Knife"
+#~ msgstr "Kniv"
+
+#~ msgid "Sword"
+#~ msgstr "Svärd"
+
+#~ msgid "Polearm"
+#~ msgstr "Spjut"
+
+#~ msgid "Staff"
+#~ msgstr "Stav"
+
+#~ msgid "Whip"
+#~ msgstr "Piska"
+
+#~ msgid "Bow"
+#~ msgstr "Båge"
+
+#~ msgid "Shooting"
+#~ msgstr "Skjutvapen"
+
+#~ msgid "Mace"
+#~ msgstr "Spikklubba"
+
+#~ msgid "Axe"
+#~ msgstr "Yxa"
+
+#~ msgid "Thrown"
+#~ msgstr "Kastvapen"
+
+#~ msgid "Craft"
+#~ msgstr "Hantverk"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "Okänd förmåga"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " kan inte skapas och existerar inte! Avslutar."
+
+#~ msgid "Couldn't set "
+#~ msgstr "Kunde inte välja "
+
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "Ansluter till karaktärsservern..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Ansluter till kontoservern..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias för /create"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Kommando: /new <grupp>"
+
+#~ msgid "a"
+#~ msgstr "en"
+
+#~ msgid "Unnamed"
+#~ msgstr "Namnlös"
 
 #~ msgid "Scroll radius"
 #~ msgstr "Rullningsradie"
@@ -3095,9 +4029,6 @@ msgstr "namnlös"
 #~ msgid "%s: %s"
 #~ msgstr "%s: %s"
 
-#~ msgid "Player deleted"
-#~ msgstr "Karaktär borttagen."
-
 #~ msgid "items.xml"
 #~ msgstr "items.xml"
 
diff --git a/po/th.po b/po/th.po
index 70ab1cb9..8054e69f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\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,577 +17,718 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "ตั้งค่า"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "กำลังเชื่อมต่อ..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "เข้าระบบ"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+msgid "Requesting characters"
+msgstr ""
+
+#: src/client.cpp:768
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "ผิดพลาด"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "รหัสผ่าน:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+msgid "Email Change"
+msgstr ""
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+msgid "Unregister Successful"
+msgstr ""
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+msgid "/createparty > Create a new party"
+msgstr ""
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:216
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+msgid "Command: /createparty <name>"
+msgstr ""
+
+#: src/commandhandler.cpp:254
+msgid "This command creates a new party called <name>."
+msgstr ""
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "ออก"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:355
+msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
 msgstr ""
 
-#: 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"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "ออก"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "เปลี่ยนที่อยู่ Email"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "สร้างตัวละคร"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "สีผม:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "ทรงผม:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "สร้าง"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "ชาย"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "หญิง"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "ผิดพลาด"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "ก่อนหน้า"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "ถัดไป"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "ชื่อ: %s"
-
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "สร้างใหม่"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "เปลี่ยนที่อยู่ Email"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr ""
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
+#: src/gui/charselectdialog.cpp:387
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr ""
-
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -600,181 +741,220 @@ msgstr "ใช่"
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "กำลังเชื่อมต่อ..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "ชื่อ: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "ใช้"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "ทิ้ง"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "ตกลง"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "ทิ้ง"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, c-format
+msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr ""
-
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
+#: src/gui/login.cpp:60
+msgid "Change Server"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "ถัดไป"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "ออก"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "ถัดไป"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -790,327 +970,294 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "สถานะ"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "ใช้"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
+#: src/gui/popupmenu.cpp:84
 #, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
+msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/partywindow.cpp:182
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, c-format
-msgid "%s has invited you to join their party."
+msgid "Attack %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
-
-#: src/gui/partywindow.cpp:211
-#, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Willpower:"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "@@attack|Attack %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "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
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
@@ -1130,135 +1277,177 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "ยืนยัน:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "ตั้งค่า"
+#: src/gui/serverdialog.cpp:143
+msgid "Server type:"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "กำลังเชื่อมต่อ..."
+
+#: src/gui/serverdialog.cpp:184
+msgid "Custom Server"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:262
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/serverdialog.cpp:417
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
+msgstr ""
+
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1301,430 +1490,592 @@ msgstr ""
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "ไม่"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:323
+#, c-format
+msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/skilldialog.cpp:405
+#, c-format
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/skilldialog.cpp:416
 #, c-format
-msgid "Job: %d"
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+
+#: src/gui/socialwindow.cpp:182
+#, c-format
+msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/socialwindow.cpp:199
+msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
+
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "สร้างตัวละคร"
+
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:502
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/trade.cpp:51
-msgid "Propose trade"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+msgid "Money"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "ยืนยันการลบตัวละคร"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+msgid "Level"
+msgstr ""
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
 #: src/gui/trade.cpp:52
-msgid "Confirmed. Waiting..."
+msgid "Propose trade"
 msgstr ""
 
 #: src/gui/trade.cpp:53
-msgid "Agree trade"
+msgid "Confirmed. Waiting..."
 msgstr ""
 
 #: src/gui/trade.cpp:54
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
 #, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
-msgid "Updating..."
-msgstr ""
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "ชื่อ: %s"
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
+#: src/gui/updatewindow.cpp:124
+msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr ""
 
@@ -1776,1207 +2127,1426 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
+#: src/gui/widgets/whispertab.cpp:87
+msgid "Command: /ignore"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:88
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:55
 msgid "Status"
 msgstr "สถานะ"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/windowmenu.cpp:61
+msgid "Shortcut"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
-msgid "Shortcut"
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:46
+msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "ยืนยันการลบตัวละคร"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Strength:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Agility:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Vitality:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "ชื่อ:"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Strength:"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Agility:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Vitality:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence:"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity:"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
-msgid "/help > Display this help."
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "ลบทิ้ง"
+
+#: src/net/ea/generalhandler.cpp:225
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/generalhandler.cpp:226
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "เปลี่ยนรหัสผ่าน"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "ยืนยันการลบตัวละคร"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:152
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "ยืนยันการลบตัวละคร"
+
+#: src/net/manaserv/charhandler.cpp:199
+msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:202
+#, c-format
+msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Willpower:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Willpower:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Willpower:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2997,14 +3567,20 @@ msgstr ""
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
+
+#~ msgid "Previous"
+#~ msgstr "ก่อนหน้า"
+
+#~ msgid "New"
+#~ msgstr "สร้างใหม่"
+
+#~ msgid "Ok"
+#~ msgstr "ตกลง"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 36a591a6..d9cb7880 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"POT-Creation-Date: 2010-03-05 21:33+0100\n"
 "PO-Revision-Date: 2009-06-05 16:09+0000\n"
 "Last-Translator: Hong Hao <Unknown>\n"
 "Language-Team: Chinese Simplified <themanaworld-devel@lists.sourceforge."
@@ -22,578 +22,735 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "设置"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "正在连接 地图 服务器..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "登录"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "选择角色"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "正在连接 地图 服务器..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "错误"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "密码："
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "改变"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "注销"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "未知命令"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- 帮助 --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > 显示此帮助"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > 显示地图名"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > 显示在线用户数"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除此窗口"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 发送私人信息给用户"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > msg的别名"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > msg的别名"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > 为和其他用户之间的私密信息开启一个新的标签页"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > query的别名"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > 显示所有公共频道"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入或者创建一个新的频道"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/party > 邀请用户参加帮会"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀请用户参加帮会"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 开始记录聊天至外部文件"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > 确定<回车>键是否切换聊天日志"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 获取列席的玩家列表（若开启logging，则发送到聊天日志）"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce >"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "命令： /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "该命令可显示所有可用命令。"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "命令： /help <命令>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "该命令显现<命令>的帮助信息"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "命令： /announce <信息>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "该命令会发送<信息>给所有在线用户。"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "命令： /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "该命令可清除历史聊天记录。"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "指令：/join <频道>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "该条命令可显现当前在线用户总数。"
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "指令：/join <频道>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "该指令让您进入<频道>。"
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "如果<频道>不存在，自动创建。"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "指令：/list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "改指令列出所有频道列表。"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "指令：/me <信息>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "该指令告诉别人你正在（做）<信息>。"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "指令：/msg <昵称><信息>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "指令：/whisper <昵称><信息>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "指令：/w <昵称><信息>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>之间有空格，用双引号(\")括起来。"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "指令：/query <昵称>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "指令：/q <昵称>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "该指令尝试为您和<昵称>之间的私聊开启一个新的标签。"
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "指令：/party <昵称>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "该指令让您进入<频道>。"
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "指令：/party <昵称>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "该命令邀请<昵称>和你聚会。"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "指令： /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "指令： /record <文件名>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "该命令开始记录聊天日志至文件<文件名>。"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "指令: /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "命令： /announce <信息>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "命令: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "该条命令显示当前地图名。"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "命令： /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr "该条命令可显现当前在线用户总数。"
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "输入 /help 获取命令列表。"
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "退出"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
+msgstr "正在连接 角色 服务器..."
+
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "不能加入工会！"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "描述：%s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "退出"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
-msgstr ""
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
+msgstr "新密码错误"
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "用户名至少需要%d个字符。"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "用户名不能少于%d个字符"
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "新电子邮件地址已经存在。"
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "密码："
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "新密码错误"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "密码需要至少%d个字符"
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "密码不能少于%d个字符。"
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "新密码错误"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "创建角色"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "姓名"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "发色："
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "发型："
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "帅哥"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "美女"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, 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:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "错误"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "确定"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "上一个"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "下一个"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "姓名：%s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "等级：%d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "注销"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "新建"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "改变"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "删除"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "注销"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "金钱：%d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "职业等级：%d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "关闭"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "金币: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "%d 玩家出席。"
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "出席： "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s窃窃私语：%s"
@@ -606,180 +763,222 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-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:269
-msgid "Unequip"
-msgstr "卸下装备"
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "姓名：%s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "金币: %s"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "纹理细节"
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "纹理细节"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "环境音效"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "装备"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "卸下装备"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "帮助"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "关闭"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "物品栏"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "装备"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "丢弃"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "分离"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "确认"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "丢弃"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "确定"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量"
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量"
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "效果：%s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "保存用户名"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "改变"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "下一个"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "下一个"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "卸下装备"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -795,325 +994,292 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|与%s交易@@"
 
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "攻击 %+d"
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "对%s窃窃私语：%s"
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Rejected invite from %s."
-msgstr ""
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|与%s交易@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|攻击%s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "忽略"
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 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:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
+#: src/gui/popupmenu.cpp:191
+#, fuzzy, c-format
+msgid "Pick up %s"
 msgstr "@@pickup|捡起%s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@use|卸载@@"
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|装备@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|使用@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|丢弃@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|分离@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
-msgstr "@@store|存贮@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "交换服务器"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "交换角色"
 
@@ -1133,137 +1299,184 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "确认："
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "电子邮件"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符。"
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符。"
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "服务器："
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "端口："
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "服务器："
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "连接中..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "自定义鼠标"
+
+#: src/gui/serverdialog.cpp:262
 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:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "设置"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "应用"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "正在连接 地图 服务器..."
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "重置窗口"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "声音"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "音频"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "音效声量"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "音乐声量"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
-msgstr ""
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
+msgstr "开始"
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
-msgstr ""
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
+msgstr "出席： "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "应用"
+
+#: src/gui/setup.cpp:51
+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,430 +1517,600 @@ msgstr "预设"
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "姓名"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "关系"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "允许私语"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "小"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "中等"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "关闭"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "视频"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "环境音效"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "纹理细节"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "否"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "改变成OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "神秘技能"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
+msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 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
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "升级"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "技能点数：%d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "技能点数：%d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "技能"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "等级：%d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "等级：%d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
-msgstr "职业：%d"
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "你确定想删除这个角色？"
+
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > 邀请用户参加帮会"
+
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > 邀请用户参加帮会"
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "状态"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "你确定想删除这个角色？"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "总计"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "花费"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "创建角色"
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "攻击:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "防御："
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "魔攻："
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "魔防："
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Ac精确度："
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% E回避率："
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% 伤害反射："
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "力量"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
+msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "敏捷"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "生命"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
+msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "智慧"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
+msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "敏捷"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "幸运"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:541
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "剩余状态点数：%d"
+msgid "%s has invited you to join their party."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "等级：%d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "金币: %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "职业：%d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "金钱：%d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "职业：%d"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "角色状态可以"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "技能点数：%d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "等级：%d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr ""
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "You give:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "姓名：%s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "更新..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "连接中..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "开始"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "已完成"
 
@@ -1779,1206 +2162,1468 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "全局公告："
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, 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:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "对%s窃窃私语：%s"
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "状态"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "命令: /where"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "该条命令可显现当前在线用户总数。"
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:94
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "该命令开始记录聊天日志至文件<文件名>。"
+
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "状态"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "选择服务器"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "改变"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr ""
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "解决按键冲突，否者游戏过程中可能发生奇怪行为。"
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "/help > 显示此帮助"
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "正在连接 地图 服务器..."
-
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "正在连接 角色 服务器..."
-
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "正在连接 帐号 服务器..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "力量："
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "敏捷："
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "生命："
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "智力："
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "智慧："
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "玩家"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "姓名"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "力量 %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "生命 %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智慧 %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "幸运 %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
 msgstr "验证失败"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
 msgstr "无可用服务器"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+#, fuzzy
+msgid "Someone else is trying to use this account."
 msgstr "某人正在尝试使用该帐号"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+#, fuzzy
+msgid "This account is already logged in."
 msgstr "该帐号已经登录"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
 msgstr "未知连接错误"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "生命"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "智慧"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "敏捷"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "幸运"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "防御："
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "魔攻："
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "魔防："
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Ac精确度："
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% E回避率："
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/party > 邀请用户参加帮会"
+
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "该命令邀请<昵称>和你聚会。"
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "该指令发送文本<信息>给<昵称>。"
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
 msgstr "原密码错误"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:85
+#, fuzzy
+msgid "New password too short."
+msgstr "新密码错误"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "未知连接错误"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "注销"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
+msgstr "错误的用户名或密码"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
+msgstr "和服务器失去连接"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
+msgstr "该帐号已经登录"
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "正在连接 地图 服务器..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "交易失败！"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "发送表情失败！"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "原地休息失败！"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "聊天创建失败！"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "不能加入工会！"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "无法呼喊！"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级！"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "HP不足！"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "SP不足！"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "没有备忘录"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能！"
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石！"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石！"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到！"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "啊？那是什么？"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "传送失败..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "无法偷取任何物品..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "毒药无效..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易不可能进行。与交易伙伴太过太过遥远"
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "交易不可能进行。角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "交易取消因不明原因。"
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "添加项目失败。交易伙伴已经负重太多。"
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "添加项目失败。交易伙伴无空闲槽存放物品。"
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知。"
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "交易取消。"
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "交易完成。"
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "You give:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "已经登录"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "用户名已存在"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "角色状态可以"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "角色状态可以"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:187
+msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "请选择交易的物品数量"
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "未知命令"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "无 游戏服务器 可用。"
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "意志力："
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "指令：/join <频道>"
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "未知命令"
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "意志力 %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "意志力："
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
 msgstr "错误的 magic_token"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "已经登录"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "服务器满载"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "新密码错误"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "账户未连接。请先登录。"
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "新电子邮件地址不正确"
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "原电子邮件地址不正确"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "新电子邮件地址已经存在。"
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "客户端版本太旧"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "错误的用户名或密码"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "错误的用户名，密码或者电子邮件地址"
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "用户名已存在"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "电子邮件地址已存在"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "已完成"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2999,20 +3644,80 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "未知物品"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "未命名的"
 
-#~ msgid "Select Character"
-#~ msgstr "选择角色"
+#~ msgid "Description: %s"
+#~ msgstr "描述：%s"
+
+#~ msgid "Previous"
+#~ msgstr "上一个"
+
+#~ msgid "New"
+#~ msgstr "新建"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "职业等级：%d"
+
+#~ msgid "Ok"
+#~ msgstr "确认"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|攻击%s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|取消@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|卸载@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|装备@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|使用@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|丢弃@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|分离@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|存贮@@"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "神秘技能"
+
+#~ msgid "Stats"
+#~ msgstr "状态"
+
+#~ msgid "Total"
+#~ msgstr "总计"
+
+#~ msgid "Cost"
+#~ msgstr "花费"
+
+#~ msgid "Attack:"
+#~ msgstr "攻击:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% 伤害反射："
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "剩余状态点数：%d"
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "正在连接 帐号 服务器..."
+
+#~ msgid "Unnamed"
+#~ msgstr "未知物品"
 
 #~ msgid "Scroll radius"
 #~ msgstr "滑动半径"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 392378fd..04fa744d 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"POT-Creation-Date: 2010-03-05 21:33+0100\n"
 "PO-Revision-Date: 2009-05-05 10:15+0000\n"
 "Last-Translator: lok0919 <lok0919@gmail.com>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
@@ -22,580 +22,733 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "設定"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "正在連接到地圖伺服器..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "登入"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "選擇角色"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "正在連接到地圖伺服器..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "錯誤"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "密碼："
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "更改"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "註冊"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 #, fuzzy
 msgid "/help > Display this help"
 msgstr "/help > 顯示幫助"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > 顯示地圖名稱"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > 顯示線上人數"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > 告訴一些有關你的事"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除此窗口"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 發送私人訊息給玩家"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > 等同msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > 等同msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > 等同query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > 顯示所有公共頻道"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入/建立一個頻道"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/party > 邀請玩家加入隊伍"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀請玩家加入隊伍"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 開始錄製聊天至外部文件"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 獲取現在的玩家名單（如果錄製聊天中，會發送到聊天記錄）"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 公告 (GM only)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "輸入/help <指令> 獲取更多幫助訊息"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "該指令可顯示所有可用指令。"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "該指令會顯示<指令>的幫助訊息"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信息>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "該指令會發送<信息>給所有線上用戶。"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "該指令可以清除聊天紀錄。"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "/join <頻道>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "這調指令可顯示目前線上人數。"
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "/join <頻道>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "這個指令令你進入 <頻道>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "如果<頻道>不存在，將會被建立"
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "這個指令會列出所有頻道"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "/me <信息>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "這個指令會告訴其他人你正在 <信息>."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "指令： /clear"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "這個指令令你進入 <頻道>."
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 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:254
+#: src/commandhandler.cpp:283
 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:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "指令： /announce <信息>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "這個指令顯示目前地圖名。"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-#, fuzzy
-msgid "Could not load map"
-msgstr "不能加入隊伍！"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
+msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "離開"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
+msgstr "正在連接角色伺服器..."
+
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "不能加入隊伍！"
+
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "說明：%s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr ""
 
-#: 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/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "離開"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "用戶名稱至少需要%d個字元。"
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "用戶名稱不能少於%d個字元"
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "密碼至少需要%d個字元"
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "密碼不能少於%d個字元。"
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "新增角色"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名字："
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "灰色："
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "髮型："
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, 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:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "錯誤"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "確定"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "上一個"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "下一個"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "名字：%s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "等級：%d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "註冊"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "新增"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "更改"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "註冊"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "金錢：%d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "職業等級：%d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "關閉"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -608,182 +761,224 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "連線中..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "裝備"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "卸下裝備"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "名字：%s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "紋理細節"
+
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "紋理細節"
+
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "裝備"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "卸下裝備"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "物品攔"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "丟棄"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "確認"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "丟棄"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "確定"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "效果：%s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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 "Port："
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr ""
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "保存用戶名"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "更改"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 #, fuzzy
 msgid "Map"
 msgstr "小地圖"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "下一個"
+
+#: src/gui/npcdialog.cpp:47
 #, fuzzy
 msgid "Submit"
 msgstr "離開"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "下一個"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "卸下裝備"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -799,329 +994,295 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 #, fuzzy
 msgid "Hats"
 msgstr "狀態"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 #, fuzzy
 msgid "Usables"
 msgstr "使用"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 #, fuzzy
 msgid "Shields"
 msgstr "技能"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@交易|與%s交易@@"
 
-#: src/gui/partywindow.cpp:185
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "攻擊:"
 
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "對%s竊竊私語：%s"
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Rejected invite from %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
-
-#: 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:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "忽略"
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 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
+#: src/gui/popupmenu.cpp:191
 #, fuzzy, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr "@@撿起|撿起%s@@"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "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:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "交換伺服器"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "交換角色"
 
@@ -1141,137 +1302,183 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "確認："
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "電子郵件"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用戶名稱至少需要%d個字元。"
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用戶名稱不能少於%d個字元"
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密碼至少需要%d個字元"
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密碼不能少於%d個字元。"
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "伺服器："
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Port："
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "伺服器："
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "連線中..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "自訂滑鼠標"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺服氣得IP地址和Port"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "選擇伺服器"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "設定"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "確定"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "正在連接到地圖伺服器..."
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "重置視窗"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "聲音"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "音效"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "音效音量"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "音樂音量"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
-msgstr ""
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
+msgstr "開始"
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "確定"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "重置視窗"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
@@ -1312,433 +1519,603 @@ msgstr "預設"
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "名字"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 #, fuzzy
 msgid "Small"
 msgstr "出售"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 #, fuzzy
 msgid "Medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "關閉"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "紋理細節"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "否"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "切換全螢幕"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "切換為OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "神秘技能"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
+msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 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
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "技能點數：%d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "技能點數：%d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "技能"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "等級：%d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "等級：%d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
-msgstr "職業：%d"
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "你確定想刪除這個角色？"
+
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > 邀請玩家加入隊伍"
+
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > 邀請玩家加入隊伍"
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "狀態"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "你確定想刪除這個角色？"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "總共"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "需求"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "新增角色"
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "攻擊:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "防禦："
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "摩攻："
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "魔防："
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Ac準確度："
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% E迴避率："
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% 傷害反射："
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "力量"
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "聊天新增失敗！"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "敏捷"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "體力"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
+msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "智力"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
+msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "閃躲"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "幸運"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "剩餘狀態點數：%d"
+msgid "You have been invited to join the %s party."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "等級：%d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "職業：%d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "金錢：%d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "職業：%d"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "角色狀態確定"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "技能點數：%d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "等級：%d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "是否交易"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "你付出:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 #, fuzzy
 msgid "You don't have enough money."
 msgstr "沒有備忘錄"
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "名字：%s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "更新中..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "連線中..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr ""
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "已完成"
 
@@ -1790,1211 +2167,1453 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "主要公告："
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, 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:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "對%s竊竊私語：%s"
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "狀態"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "指令: /where"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "這調指令可顯示目前線上人數。"
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "狀態"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "快捷鍵"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "選擇伺服器"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "更改"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "裝備"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:80
 #, fuzzy
-msgid "Party Window"
+msgid "Social Window"
 msgstr "重置視窗"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "裝備"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr ""
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "解決按鍵衝突，否則遊戲中可能遇到奇怪行為。"
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr ""
+#: src/main.cpp:45
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "/help > 顯示幫助"
 
-#: src/main.cpp:581
+#: src/main.cpp:46
 #, fuzzy
-msgid "  -h --help        : Display this help"
+msgid "  -h --help           : Display this help"
 msgstr "/help > 顯示幫助"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "正在連接到地圖伺服器..."
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "正在連接角色伺服器..."
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "正在連接帳號伺服器..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "確認刪除角色"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "玩家"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "名字"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "力量"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "敏捷"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "體力"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "智力"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "閃躲"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "幸運"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
+msgstr "聊天新增失敗！"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "體力"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "智力"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "閃躲"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "幸運"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "防禦："
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "摩攻："
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "魔防："
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Ac準確度："
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% E迴避率："
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > 顯示幫助"
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/party > 邀請玩家加入隊伍"
+
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "這個指令會告訴其他人你正在 <信息>."
+
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "這個指令顯示目前地圖名。"
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "不明指令"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "註冊"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
+msgstr "和伺服器失去連線"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "正在連接到地圖伺服器..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "交易失敗！"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "顯示表情失敗！"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "坐下休息失敗！"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "聊天新增失敗！"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "不能加入隊伍！"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "無法大叫！"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒達到足夠等級！"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "HP不夠！"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "SP不夠！"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能！"
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "你需要再一顆紅寶石!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "你需要再一棵藍寶石!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "你已負重太多，不能再多!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "傳送失敗..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "無法偷取任何物品..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "你付出:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "確認刪除角色"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "確認刪除角色"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "請選擇交易的物品數量"
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "不明指令"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "/join <頻道>"
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "不明指令"
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "意志力:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "意志力:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 #, fuzzy
 msgid "Error creating guild."
 msgstr "聊天新增失敗！"
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "已完成"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3015,20 +3634,78 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "未知物品"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "選擇角色"
+#~ msgid "Description: %s"
+#~ msgstr "說明：%s"
+
+#~ msgid "Previous"
+#~ msgstr "上一個"
+
+#~ msgid "New"
+#~ msgstr "新增"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "職業等級：%d"
+
+#~ msgid "Ok"
+#~ msgstr "確認"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@攻擊|攻擊%s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@取消|取消@@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@使用|卸下@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@使用|裝備@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@使用|使用@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@丟棄|丟棄@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@分離|分離@@"
+
+#, fuzzy
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@使用|使用@@"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "神秘技能"
+
+#~ msgid "Stats"
+#~ msgstr "狀態"
+
+#~ msgid "Total"
+#~ msgstr "總共"
+
+#~ msgid "Cost"
+#~ msgstr "需求"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% 傷害反射："
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "剩餘狀態點數：%d"
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "正在連接帳號伺服器..."
+
+#~ msgid "Unnamed"
+#~ msgstr "未知物品"
 
 #~ msgid "Save player list"
 #~ msgstr "保存玩家列表"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 610bea5e..5aafc1fe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"POT-Creation-Date: 2010-03-05 21:33+0100\n"
 "PO-Revision-Date: 2009-05-15 02:25+0000\n"
 "Last-Translator: netwareboss <netwareboss@gmail.com>\n"
 "Language-Team: Traditional Chinese <themanaworld-devel@lists.sourceforge."
@@ -22,231 +22,346 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "設定"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "正在連接到地圖伺服器..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "登入"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "選擇角色"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "正在連接到地圖伺服器..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "錯誤"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "密碼："
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "更改"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "取消註冊"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "無效的更新主機: "
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr "建立更新目錄失敗！"
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- 說明 --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help >顯示指令說明"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > 顯示地圖名稱"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > 顯示線上使用者的數量"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > 顯示關於自己的資訊"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > 清除這個視窗"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > 傳送私人訊息給某使用者"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > 效果同 msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > 效果同 msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > 建立與另一個使用者的私人訊息分頁"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr "/q > 效果同 query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr "/list > 顯示所有公開頻道"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > 加入或建立頻道"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > 建立新的隊伍"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "/party > 邀請使用者組隊"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > 開始紀錄對話內容到外部檔案"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > 是否切換回聊天視窗"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr "/present > 取得上線玩家的清單（如果開啟記錄，傳送到聊天紀錄）"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > 全域廣播 (GM 專用)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "輸入/help <指令> 獲取更多幫助訊息"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "指令： /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "該指令可顯示所有可用指令。"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "指令： /help <指令>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "該指令會顯示<指令>的幫助訊息"
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr "指令： /announce <信息>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr "*** 只有GM可用 ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "該指令會發送<信息>給所有線上用戶。"
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "指令： /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "該指令可以清除聊天紀錄。"
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "/item <政策>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "這調指令可顯示目前線上人數。"
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "指令: /join <頻道名稱>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "這個指令可以讓你輸入 <頻道名稱>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "假如 <頻道名稱> 不存在,那就建立."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "指令： /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "這個指令會顯示所有頻道的清單。"
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr "指令： /me <message>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr "這個指令會告訴其他人您正在做 <msg> 的事。"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr "指令： /msg <nick> <message>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr "指令： /whisper <nick> <message>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "指令： /w <nick> <message>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "這個指令會傳送 <message> 的文字給 <nick>。"
 
-#: 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
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr "指令： /query <nick>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr "指令： /q <nick>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "這個指令會嘗試建立您和 <nick> 之間的悄悄話分頁。"
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "指令： /create <隊伍名稱>"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "這些指令會建立叫做 <隊伍名稱> 的新隊伍。"
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr "指令： /party <nick>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "這個指令會邀請 <nick> 跟您組隊。"
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr "指令： /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 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:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr "指令： /record <filename>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr "指令： /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr "這個指令會結束錄製的作業階段。"
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr "指令： /toggle <state>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr "這指令用來設定\"enter\"鍵是否切換聊天記錄,或者自動關閉記錄"
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -254,351 +369,396 @@ msgstr ""
 "可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開，或是 \"0\"、\"no\"、"
 "\"false\" 來代表切換為關閉."
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr "指令： /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr "這個指令顯示輸入切換狀態"
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "/item <政策>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "指令: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "這個指令顯示目前地圖名。"
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "指令： /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr "這調指令可顯示目前線上人數。"
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "輸入 /help 獲取指令列表。"
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr "傳送密語失敗"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, fuzzy, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "不能創造一個密語區塊給\"%s\"! 他不是已經存在,或就是你."
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "漏掉隊伍名稱。"
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr "關閉密語"
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr "切換聊天"
 
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:484
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "隊伍已成功的建立。"
+
+#: src/commandhandler.cpp:486
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr "無法傳送悄悄話，被使用者忽略"
+
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:508
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr "無法傳送悄悄話，被使用者忽略"
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
-#: src/engine.cpp:88
-#, fuzzy
-msgid "Could not load map"
-msgstr "不能加入隊伍！"
-
-#: src/engine.cpp:89
-#, fuzzy, c-format
-msgid "Error while loading %s"
-msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
-
-#: src/game.cpp:237
+#: src/game.cpp:172
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:326
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "抓圖存到 ~/"
 
-#: src/game.cpp:409
+#: src/game.cpp:331
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr "已中斷連線到伺服器,程式將要離開"
 
-#: src/game.cpp:491
+#: src/game.cpp:360
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "離開"
-
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "您確定要離開?"
-
-#: src/game.cpp:665
-msgid "no"
-msgstr "否"
-
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "好友"
+#: src/game.cpp:946
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "不能加入隊伍！"
+
+#: src/game.cpp:947
+#, fuzzy, c-format
+msgid "Error while loading %s"
+msgstr "NPC 資料庫：當載入 npcs.xml 時發生錯誤！"
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "好友清單"
+#: src/gui/beingpopup.cpp:75
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "隊伍(%s)"
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
-msgstr "最大"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
+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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "說明：%s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr "減少"
 
-#: 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/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "離開"
+
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr "最大"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "出售"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "取消"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "變更郵件地址"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "帳號: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+#, fuzzy
+msgid "Type new email address twice:"
 msgstr "輸入新的電子郵件地址兩次:"
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "用戶名稱至少需要%d個字元。"
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "用戶名稱不能少於%d個字元"
+
+#: src/gui/changeemaildialog.cpp:141
+#, fuzzy
+msgid "The email address entries mismatch."
+msgstr "電子郵件已經被註冊"
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 #, fuzzy
 msgid "Type new password twice:"
 msgstr "輸入新密碼兩次:"
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "密碼至少需要%d個字元"
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "密碼不能少於%d個字元。"
+
+#: src/gui/changepassworddialog.cpp:130
+#, fuzzy
+msgid "The new password entries mismatch."
+msgstr "輸入新密碼兩次:"
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "新增角色"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "名字："
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "髮色："
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "髮型："
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, 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:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "錯誤"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr "帳號與角色管理"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "確定"
-
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "上一個"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "下一個"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "名字：%s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "等級：%d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "取消註冊"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "新增"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "變更郵件地址"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "取消註冊"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "金錢：%d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr "職業等級：%d"
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "關閉"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "金錢: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chat.cpp:326
-#, c-format
-msgid "%d players are present."
+#: src/gui/chat.cpp:287
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
 msgstr "%d 位玩家的清單"
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "上線: "
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr "將上線訊息寫入錄製紀錄。"
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -611,181 +771,223 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "連線中..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "裝備"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "卸下裝備"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
-msgstr "公會"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, fuzzy, c-format
+msgid "Music: %s"
+msgstr "主題: "
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
-msgstr "建立公會"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "名字：%s"
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
-msgstr "邀請使用者"
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, fuzzy, c-format
+msgid "Minimap: %s"
+msgstr "小地圖"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "粒子效果"
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
-msgstr "離開公會"
+#: src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "紋理細節"
+
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "環境效果"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "裝備"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "卸下裝備"
 
-#: src/gui/help.cpp:34
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "物品攔"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "丟棄"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr "欄位:"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr "重量:"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "確認"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "丟棄"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "確定"
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "選擇要儲存的物品數量。"
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "選擇要取回的物品數量。"
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
 msgstr "重量: "
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 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 "端口(port):"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr "記錄的:"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
+#: src/gui/login.cpp:58
+#, fuzzy
+msgid "Remember username"
 msgstr "保存用戶名"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 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 "魔法"
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr "施展測試咒文 1"
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr "施展測試咒文 2"
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr "施展測試咒文 3"
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "伺服器"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "地圖"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr "等待伺服器中"
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "下一個"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr "確認"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr "重設"
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "下一個"
+
+#: src/gui/npcpostdialog.cpp:47
 #, fuzzy
 msgid "To:"
 msgstr "主題: "
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr "傳送"
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, fuzzy, c-format
+msgid "Outfit: %d"
+msgstr "體力: %d"
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "卸下裝備"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr "文字"
 
@@ -801,325 +1003,302 @@ msgstr "文字輪廓"
 msgid "Progress Bar Labels"
 msgstr "進度列標籤"
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "背景"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr "突顯"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr "分頁突顯"
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+#, fuzzy
+msgid "Item Too Expensive"
 msgstr "物品太貴"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+#, fuzzy
+msgid "Item Is Equipped"
 msgstr "物品已裝備"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "遊戲管理者"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "悄悄話"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "是"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr "隊伍"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "公會"
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr "伺服器"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr "記錄器"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr "超連結"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr "物件"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr "其他使用者名字"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr "我的名字"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr "遊戲管理者名字"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr "電腦"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr "怪物"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr "不明物品類型"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr "一般"
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr "帽子"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr "可使用的"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr "內衣"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+#, fuzzy
+msgid "One Handed Weapons"
 msgstr "單手武器"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr "褲子"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr "鞋子"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
-msgstr "雙手武器"
+#: src/gui/palette.cpp:122
+#, fuzzy
+msgid "Two Handed Weapons"
+msgstr "單手武器"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr "盾牌"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr "戒指"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr "腕甲"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr "武器"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr "箭"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr "粒子效果"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr "撿拾通知"
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr "經驗值通知"
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+#, fuzzy
+msgid "Player Hits Monster"
 msgstr "玩家攻擊怪物"
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+#, fuzzy
+msgid "Monster Hits Player"
 msgstr "怪物攻擊玩家"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr "致命一擊"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr "失誤"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr "血量"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr "3/4 血量"
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr "1/2 血量"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr "1/4 血量"
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr "隊伍(%s)"
-
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
-
-#: src/gui/partywindow.cpp:182
+#: src/gui/popupmenu.cpp:84
 #, fuzzy, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s 已經離開您的隊伍。"
+msgid "Trade with %s..."
+msgstr "交易對象: "
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
 #, fuzzy, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s 已經離開您的隊伍。"
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
-msgstr ""
-
-#: src/gui/partywindow.cpp:204
-#, c-format
-msgid "Accepted invite from %s."
-msgstr ""
+msgid "Attack %s"
+msgstr "攻擊 %+d"
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:92
 #, fuzzy, c-format
-msgid "Rejected invite from %s."
-msgstr "被伺服器拒絕"
-
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|增加聊天名單@@"
-
-#: 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@@"
+msgid "Whisper %s"
+msgstr "悄悄話"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
+#: src/gui/popupmenu.cpp:101
+#, fuzzy, c-format
+msgid "Befriend %s"
 msgstr "@@friend|與%s交朋友@@"
 
-#: src/gui/popupmenu.cpp:99
-#, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|無視 %s@@"
+#: src/gui/popupmenu.cpp:106
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "不理"
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore| 忽視 %s@@"
+#: src/gui/popupmenu.cpp:109
+#, fuzzy, c-format
+msgid "Ignore %s"
+msgstr "忽略"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
-msgstr "@@unignore| 不忽視 %s@@"
+msgid "Unignore %s"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "@@ignore|Completely ignore %s@@"
+#: src/gui/popupmenu.cpp:118
+#, fuzzy, c-format
+msgid "Completely ignore %s"
 msgstr "@@ignore|完全忽視 %s@@"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Follow %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:133
+#, fuzzy, c-format
+msgid "Invite %s to join your guild"
 msgstr "@@guild|邀請 %s 加入你的公會@@"
 
-#: src/gui/popupmenu.cpp:119
-#, c-format
-msgid "@@party|Invite %s to join your party@@"
+#: src/gui/popupmenu.cpp:137
+#, fuzzy, c-format
+msgid "Invite %s to join your party"
 msgstr "@@party|邀請 %s 加入你的隊伍@@"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|踢掉玩家@@"
+#: src/gui/popupmenu.cpp:144
+#, fuzzy
+msgid "Kick player"
+msgstr "踢人失敗！"
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
+#: src/gui/popupmenu.cpp:153
+#, fuzzy, c-format
+msgid "Talk to %s"
 msgstr "@@對話|與 %s 對話@@"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:166
+#, fuzzy
+msgid "Kick monster"
 msgstr "@@admin-kick|移除怪物@@"
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
-msgstr "@@取消|取消@@"
+#: src/gui/popupmenu.cpp:174
+#, fuzzy
+msgid "Add name to chat"
+msgstr "@@name|增加聊天名單@@"
 
-#: src/gui/popupmenu.cpp:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|撿起 %s @@"
+#: src/gui/popupmenu.cpp:191
+#, fuzzy, c-format
+msgid "Pick up %s"
+msgstr "撿拾"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+#, fuzzy
+msgid "Add to chat"
 msgstr "@@chat|加入聊天@@"
 
-#: 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
-msgid "@@store|Store@@"
-msgstr "@@store|儲存@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
+msgstr "寄放"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|檢索@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
+msgstr "取回"
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "交換伺服器"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "交換角色"
 
@@ -1139,137 +1318,189 @@ msgstr "已經錄製。"
 msgid "Starting to record..."
 msgstr "開始錄製..."
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr "開始錄製失敗。"
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr "正在錄製..."
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr "停止錄製"
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "確認："
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "電子郵件"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用戶名稱至少需要%d個字元。"
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用戶名稱不能少於%d個字元"
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密碼至少需要%d個字元"
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密碼不能少於%d個字元。"
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+#, fuzzy
+msgid "Choose Your Server"
 msgstr "選擇您的伺服器"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "伺服器："
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "端口(port):"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "伺服器："
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "連線中..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "自訂滑鼠標"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "請輸入伺服氣得IP地址和Port"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "選擇伺服器"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "設定"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "確定"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "等待伺服器中"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "重置視窗"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "聲音"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "音效"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "音效音量"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "音樂音量"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "沒有文字"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr "這是顏色看起來的樣子"
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr "顏色"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+#, fuzzy
+msgid "Type:"
 msgstr "類型: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr "狀態"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "暫停"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "光譜"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+#, fuzzy
+msgid "Delay:"
 msgstr "延遲: "
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+#, fuzzy
+msgid "Red:"
 msgstr "紅: "
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+#, fuzzy
+msgid "Green:"
 msgstr "綠: "
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+#, fuzzy
+msgid "Blue:"
 msgstr "藍: "
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "確定"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "重置視窗"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
@@ -1310,431 +1541,620 @@ msgstr "預設"
 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
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "名字"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr "不理"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr "???"
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr "將所有的悄悄話放到分頁中"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+#, fuzzy
+msgid "Show gender"
+msgstr "顯示名稱"
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "玩家"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr "小"
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr "小型"
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr "中型"
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr "大型"
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr "沒有文字"
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr "有聊天泡泡,沒名字"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr "聊天泡泡加名字"
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "關閉"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "低"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "高"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "中"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "最大"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr "可見的名稱"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr "粒子效果"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+#, fuzzy
+msgid "Show own name"
 msgstr "顯示名稱"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr "顯示撿拾通知"
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr "聊天中"
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr "同粒子設定"
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "顯示"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+#, fuzzy
+msgid "Show monster damage"
+msgstr "顯示名稱"
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr "置頂文字"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Gui 透明度"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "環境效果"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+#, fuzzy
+msgid "Particle detail"
 msgstr "紋理細節"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr "字型大小"
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "無法切換到 "
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "視窗化"
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "否"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
-msgstr "全螢幕"
+#: src/gui/setup_video.cpp:381
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "模式和恢復舊模式也沒有！"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "模式和恢復舊模式也沒有！"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "切換全螢幕"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "切換為OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "螢幕解析度已變更"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr "請重新啟動您的客戶端讓變更生效。"
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_video.cpp:522
+#, fuzzy
+msgid "Particle Effect Settings Changed."
 msgstr "粒子效果設定值已變更。"
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:523
 msgid "Changes will take effect on map change."
 msgstr "變更會在地圖改變後生效。"
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "神秘技能"
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 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
+#: src/gui/skilldialog.cpp:208
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
-msgstr "武器"
+#: src/gui/skilldialog.cpp:262
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "技能點數：%d"
+
+#: src/gui/skilldialog.cpp:314
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "技能點數：%d"
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "技能"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "等級：%d"
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
-msgstr "工藝品"
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "等級：%d"
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:117
 #, c-format
-msgid "Job: %d"
-msgstr "職業：%d"
+msgid "Invited user %s to guild %s."
+msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
-msgstr "體力 :"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
-msgstr "經驗值:"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
+msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
-msgstr "魔力:"
+#: src/gui/socialwindow.cpp:137
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
-msgstr "職業:"
+#: src/gui/socialwindow.cpp:146
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "建立公會"
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "狀態"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "您確定要離開?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "總共"
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "/party > 邀請使用者組隊"
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "需求"
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "攻擊:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "/party > 邀請使用者組隊"
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "防禦："
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "摩攻："
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
+msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "魔防："
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "您確定要離開?"
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Ac準確度："
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr "建立公會"
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% E迴避率："
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "新增角色"
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% 傷害反射："
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "力量"
+#: src/gui/socialwindow.cpp:297
+#, fuzzy
+msgid "Invite"
+msgstr "邀請使用者"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "敏捷"
+#: src/gui/socialwindow.cpp:298
+#, fuzzy
+msgid "Leave"
+msgstr "大型"
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "體力"
+#: src/gui/socialwindow.cpp:394
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "被伺服器拒絕"
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "智力"
+#: src/gui/socialwindow.cpp:400
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "被伺服器拒絕"
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "閃躲"
+#: src/gui/socialwindow.cpp:413
+#, fuzzy, c-format
+msgid "Accepted guild invite from %s."
+msgstr "被伺服器拒絕"
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "幸運"
+#: src/gui/socialwindow.cpp:419
+#, fuzzy, c-format
+msgid "Rejected guild invite from %s."
+msgstr "被伺服器拒絕"
+
+#: src/gui/socialwindow.cpp:463
+#, fuzzy, c-format
+msgid "Creating guild called %s."
+msgstr "建立更新目錄失敗！"
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:477
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "剩餘狀態點數：%d"
+msgid "Creating party called %s."
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
-msgstr "最大等級"
+#: src/gui/socialwindow.cpp:484
+#, fuzzy
+msgid "Guild Name"
+msgstr "公會"
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
-msgstr "貯藏庫"
+#: src/gui/socialwindow.cpp:485
+#, fuzzy
+msgid "Choose your guild's name."
+msgstr "選擇您的伺服器"
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
-msgstr "寄放"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
-msgstr "取回"
+#: src/gui/socialwindow.cpp:502
+#, fuzzy, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s 已經離開您的隊伍。"
 
-#: src/gui/trade.cpp:51
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s 已經離開您的隊伍。"
+
+#: src/gui/socialwindow.cpp:533
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s 已經離開您的隊伍。"
+
+#: src/gui/socialwindow.cpp:541
+#, fuzzy, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s 已經離開您的隊伍。"
+
+#: src/gui/socialwindow.cpp:546
+#, fuzzy, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s 已經離開您的隊伍。"
+
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+#, fuzzy
+msgid "Party Name"
+msgstr "隊伍"
+
+#: src/gui/socialwindow.cpp:571
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "選擇您的伺服器"
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "等級：%d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "金錢: %s"
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr "體力 :"
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr "經驗值:"
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr "魔力:"
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "職業：%d"
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr "職業:"
+
+#: src/gui/statuswindow.cpp:194
+#, fuzzy
+msgid "HP"
+msgstr "體力 :"
+
+#: src/gui/statuswindow.cpp:200
+#, fuzzy
+msgid "MP"
+msgstr "魔力:"
+
+#: src/gui/statuswindow.cpp:206
+#, fuzzy
+msgid "Exp"
+msgstr "經驗值:"
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "金錢：%d"
+
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "職業:"
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "角色狀態確定"
+
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "技能點數：%d"
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "等級：%d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
+msgstr "貯藏庫"
+
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "是否交易"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr "已確認。請稍候..."
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr "已同意。請稍候..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr "交易：您"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "增加"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
 msgstr "您得到 %s。"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 #, fuzzy
 msgid "You don't have enough money."
 msgstr "您沒有足夠的錢"
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "名字：%s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "更新中..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "連線中..."
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "curl 錯誤 "
-
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " 主機: "
-
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程序不完整。"
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "##1  您稍後再試一次"
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "已完成"
 
@@ -1786,646 +2206,752 @@ msgstr "這個指令會離開目前的頻道。"
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "如果您是此頻道中的最後一個人，這個頻道就會被刪除。"
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "指令： /op <nick>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr "這個指令會讓 <nick> 成為頻道操作者。"
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr "頻道操作者可以對該頻道中的其他使用者進行 kick 或 op。"
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "指令： /kick <nick>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr "這個指令會讓 <nick> 離開此頻道。"
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "需要指定要成為 op 的使用者！"
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr "需要指定要踢掉的使用者！"
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr "主要公告："
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 主要公告："
 
-#: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
+#: src/gui/widgets/chattab.cpp:150
+#, fuzzy, c-format
+msgid "%s whispers: %s"
 msgstr "%s 的悄悄話: "
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr "不能傳送空的聊天訊息！"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr "/close > 關閉悄悄話分頁"
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr "指令： /close"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr "這個指令會關閉目前的悄悄話分頁。"
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "狀態"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "指令： /item"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr "公會"
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "這調指令可顯示目前線上人數。"
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr "好友"
+#: src/gui/widgets/whispertab.cpp:94
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
+
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "狀態"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "快捷鍵"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "選擇確定"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "更改"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "選擇您的伺服器"
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr "上移"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr "下移"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr "左移"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr "右移"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr "攻擊"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr "尋找目標攻擊"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr "史萊姆吃掉妳了~~"
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr "說話"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr "停止攻擊"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Target Monster"
 msgstr "最接近的目標"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr "隱藏視窗"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr "尋找至滑鼠的路徑"
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: 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
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr "物品欄視窗"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "裝備視窗"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr "聊天視窗"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr "物品捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr "程式除錯視窗"
 
-#: src/keyboardconfig.cpp:81
-msgid "Party Window"
-msgstr "隊伍視窗"
+#: src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Social Window"
+msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
 msgstr "表情捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:82
+#, fuzzy
+msgid "Outfits Window"
+msgstr "狀態視窗"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
+msgstr ""
+
 #: 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
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr "切換聊天"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr "將聊天向上捲動"
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr "將聊天向下捲動"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr "前一個聊天分頁"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr "下一個聊天分頁"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr "選擇確定"
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr "未命名"
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr "小刀"
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr "劍"
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr "長戰斧"
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr "杖"
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr "鞭子"
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr "弓"
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr "射擊"
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr "錘"
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr "斧"
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr "投擲"
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr "工藝品"
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr "不明的技能"
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr "無效的更新主機: "
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr "建立更新目錄失敗！"
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
-msgstr " 不能建立，但是它也不存在！現在結束。"
+#: src/keyboardconfig.cpp:178
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "解決按鍵衝突，否則遊戲中可能遇到奇怪行為。"
 
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "無法設定 "
+#: src/localplayer.cpp:913
+#, fuzzy
+msgid "Unable to pick up item."
+msgstr "無法撿拾物品"
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr " 視訊模式: "
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "你撿起了 %s [@@%d|%s@@]"
+msgstr[1] "你撿起了 %s [@@%d|%s@@]"
 
-#: src/main.cpp:575
-msgid "mana"
-msgstr "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr "選項:"
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
-msgstr "  -C --config-file : 使用此設定檔"
-
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr "  -d -data : 指定遊戲資料所在的目錄"
-
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
-msgstr "  -D --default : 選擇預設的角色伺服器及角色"
+#: src/main.cpp:45
+#, fuzzy
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : 顯示遊戲版本"
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
 msgstr "  -h --help : 顯示求助說明"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
-msgstr "  -S --home-dir : 設定此目錄為家目錄"
+#: src/main.cpp:47
+#, fuzzy
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file : 使用此設定檔"
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
-msgstr "  -H --update-host : 使用此更新伺服器"
+#: src/main.cpp:48
+#, fuzzy
+msgid "  -U --username       : Login with this username"
+msgstr "  -U -username : 使用此帳號登入"
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:49
+#, fuzzy
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : 用此密碼登入"
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:50
+#, fuzzy
+msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : 用此帳號登入"
 
-#: src/main.cpp:586
+#: src/main.cpp:51
 #, fuzzy
-msgid "  -p --port        : Login server port"
-msgstr "  -p --port : 伺服器端口"
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : 登入伺服器名稱或IP位址"
 
-#: src/main.cpp:587
+#: src/main.cpp:52
 #, fuzzy
-msgid "  -s --server      : Login server name or IP"
-msgstr "  -s --server : 登入伺服器名稱或IP位址"
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : 伺服器端口"
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
-msgstr "  -u --skip-update : 不使用更新"
+#: src/main.cpp:53
+#, fuzzy
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host : 使用此更新伺服器"
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
-msgstr "  -U -username : 使用此帳號登入"
+#: src/main.cpp:54
+#, fuzzy
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default : 選擇預設的角色伺服器及角色"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : 不使用OpenGL"
+#: src/main.cpp:56
+#, fuzzy
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update : 不使用更新"
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
-msgstr "  -v --version : 顯示遊戲版本"
+#: src/main.cpp:57
+#, fuzzy
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d -data : 指定遊戲資料所在的目錄"
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "正在連接到地圖伺服器..."
+#: src/main.cpp:58
+#, fuzzy
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -S --home-dir : 設定此目錄為家目錄"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "正在連接角色伺服器..."
+#: src/main.cpp:59
+#, fuzzy
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "  -S --home-dir : 設定此目錄為家目錄"
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "正在連接帳號伺服器..."
+#: src/main.cpp:61
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl : 不使用OpenGL"
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr "踢人失敗！"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr "踢人成功！"
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 #, fuzzy
 msgid "Nothing to sell."
 msgstr "沒有東西可賣"
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 #, fuzzy
 msgid "Thanks for buying."
 msgstr "感謝購買"
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 #, fuzzy
 msgid "Unable to buy."
 msgstr "無法購買"
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 #, fuzzy
 msgid "Thanks for selling."
 msgstr "感謝賣出"
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 #, fuzzy
 msgid "Unable to sell."
 msgstr "無法販賣"
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+#, fuzzy
+msgid "Access denied."
 msgstr "存取被拒"
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+#, fuzzy
+msgid "Cannot use this ID."
 msgstr "不能使用這個 ID"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+#, fuzzy
+msgid "Unknown failure to select character."
 msgstr "選擇角色發生不明的失敗"
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "建立角色失敗。最有可能的情形是該名稱已經被使用了。"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr "資訊"
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "確認刪除角色"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr "刪除角色失敗。"
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "力量:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "敏捷:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "體力:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "智力:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "閃躲:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr "幸運:"
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 #, fuzzy
 msgid "Whisper could not be sent, user is offline."
 msgstr "無法傳送悄悄話，使用者已離線"
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 #, fuzzy
 msgid "Whisper could not be sent, ignored by user."
 msgstr "無法傳送悄悄話，被使用者忽略"
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "玩家"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr "頻道不支援！"
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
-msgstr "無法裝備。"
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
+msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr "無法卸下裝備。"
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "名字"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "交易的要求"
+
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, c-format
 msgid "Strength %+d"
 msgstr "力量 %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, c-format
 msgid "Agility %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Vitality %+d"
 msgstr "體力 %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智力 %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Dexterity %+d"
 msgstr "閃躲 %+d"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "幸運  %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+#, fuzzy
+msgid "Authentication failed."
 msgstr "驗證失敗"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+#, fuzzy
+msgid "No servers available."
 msgstr "沒有可用的伺服器"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+#, fuzzy
+msgid "Someone else is trying to use this account."
 msgstr "此帳號正在使用中"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+#, fuzzy
+msgid "This account is already logged in."
 msgstr "這個帳號已經登入"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+#, fuzzy
+msgid "Speed hack detected."
 msgstr "使用加速器"
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+#, fuzzy
+msgid "Duplicated login."
 msgstr "重複登入"
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+#, fuzzy
+msgid "Unknown connection error."
 msgstr "不明的連線錯誤"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr "體力"
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "智力"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "閃躲"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "幸運"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "防禦："
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "摩攻："
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "魔防："
+
+#: src/net/ea/generalhandler.cpp:227
+#, fuzzy, c-format
+msgid "% Accuracy"
+msgstr "% Ac準確度："
+
+#: src/net/ea/generalhandler.cpp:228
+#, fuzzy, c-format
+msgid "% Evade"
+msgstr "% E迴避率："
+
+#: src/net/ea/generalhandler.cpp:229
+#, fuzzy, c-format
+msgid "% Critical"
+msgstr "致命一擊"
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr "/help > 顯示這個說明文件。"
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
-msgstr "/create > 建立新的隊伍"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > 邀請玩家加入您的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
-msgstr "/new > 效果同 create 指令"
+#: src/net/ea/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > 離開您加入的隊伍"
+
+#: src/net/ea/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > 從您加入的隊伍中把某人踢出"
+
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "/invite <暱稱>"
+
+#: src/net/ea/gui/guildtab.cpp:74
+#, fuzzy
+msgid "This command invites <nick> to the guild you're in."
+msgstr "這個指令會邀請 <nick> 跟您組隊。"
 
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "指令： /leave"
+
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "這個指令會使玩家離開隊伍。"
+
+#: src/net/ea/gui/guildtab.cpp:89
+#, fuzzy
+msgid "Guild name is missing."
+msgstr "漏掉隊伍名稱。"
+
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:303
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s 現在已經是您隊伍的成員。"
+
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:313
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "給 %s 的不明邀請回應。"
+
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀請玩家加入您的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 離開您加入的隊伍"
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > 從您加入的隊伍中把某人踢出"
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/ea/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 顯示/改變隊伍道具分享選項"
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/ea/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 顯示/改變隊伍經驗值分享選項"
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
-msgstr "指令： /new <隊伍名稱>"
-
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
-msgstr "指令： /create <隊伍名稱>"
-
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
-msgstr "這些指令會建立叫做 <隊伍名稱> 的新隊伍。"
-
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
-msgstr "/invite <暱稱>"
-
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
-msgstr "指令： /leave"
-
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "這個指令會使玩家離開隊伍。"
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr "/item <政策>"
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "這個指令會改變隊伍的道具分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -2433,23 +2959,23 @@ msgstr ""
 "<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享，或是 \"0\"、"
 "\"no\"、\"false\" 來停用道具分享。"
 
-#: src/net/ea/gui/partytab.cpp:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr "指令： /item"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr "這個指令會顯示此隊伍目前的道具分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr "指令： /exp <政策>"
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr "這個指令會改變此隊伍的經驗值分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2457,106 +2983,111 @@ msgstr ""
 "<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享，或是 \"0\"、"
 "\"no\"、\"false\" 來停用經驗值分享。"
 
-#: src/net/ea/gui/partytab.cpp:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr "指令： /exp"
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr "這個指令會顯示此隊伍目前的經驗值分享政策。"
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr "漏掉隊伍名稱。"
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr "物品分享已啟用。"
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr "物品分享已停用。"
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr "物品分享不可能。"
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "物品分享已啟用。"
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr "經驗值分享已啟用。"
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr "經驗值分享已停用。"
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr "經驗值分享不可能。"
 
-#: src/net/ea/inventoryhandler.cpp:185
+#: src/net/ea/gui/partytab.cpp:176
 #, fuzzy
-msgid "Unable to pick up item."
-msgstr "無法撿拾物品"
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
-msgstr ""
-
-#: src/net/ea/inventoryhandler.cpp:199
-#, fuzzy, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "你撿起了 %s [@@%d|%s@@]"
+msgid "Experience sharing unknown."
+msgstr "經驗值分享已啟用。"
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:281
 #, fuzzy
 msgid "Failed to use item."
 msgstr "使用物品失敗"
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
+msgstr "無法裝備。"
+
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
+msgstr "無法卸下裝備。"
+
+#: src/net/ea/loginhandler.cpp:79
 #, fuzzy
 msgid "Account was not found. Please re-login."
 msgstr "帳號還沒連線,請先登入"
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+#, fuzzy
+msgid "Old password incorrect."
 msgstr "舊密碼輸入錯誤"
 
-#: src/net/ea/loginhandler.cpp:82
+#: src/net/ea/loginhandler.cpp:85
 #, fuzzy
-msgid "New password too short"
+msgid "New password too short."
 msgstr "新密碼不正確"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
 msgstr "不明的錯誤"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
 msgstr "未註冊的 ID"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+#, fuzzy
+msgid "Wrong password."
 msgstr "錯誤的密碼"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+#, fuzzy
+msgid "Account expired."
 msgstr "帳號已過期"
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+#, fuzzy
+msgid "Rejected from server."
 msgstr "被伺服器拒絕"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
+#, fuzzy
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已經被這個遊戲永遠列入黑名單。請連絡 GM 團隊。"
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, fuzzy, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2565,456 +3096,641 @@ msgstr ""
 "您暫時被此遊戲列入黑名單，直到 %s。\n"
 " 請透過討論區連絡 GM 團隊。"
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+#, fuzzy
+msgid "This user name is already taken."
 msgstr "這個使用者名稱已經被使用了"
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+#, fuzzy
+msgid "Unable to resolve host \""
+msgstr "無法販賣"
+
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "正在連接到地圖伺服器..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "無法建立隊伍。"
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr "隊伍已成功的建立。"
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s 已經是隊伍的一員。"
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s 拒絕您的邀請。"
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s 現在已經是您隊伍的成員。"
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "給 %s 的不明邀請回應。"
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr "您已經離開此隊伍。"
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr "%s 已經離開您的隊伍。"
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "不明的成員試著要說：%s"
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr "此時無法支援邀請"
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s 不在您的隊伍中！"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr "您已經死亡。"
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "我們很遺憾的通知您，您的角色已經在戰鬥中被殺了。"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr "您不再是那麼有活力。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr "遊戲結束！"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr "請投入金幣"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr "我猜這並沒有跑得很好"
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr "您想要鑑定你的財產嗎？"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr "很悲傷的，沒有人發現你的蹤跡..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr "灰飛煙滅了。"
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr "看起來你把你的頭拿在手上。"
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "你又被幹掉啦!!!躺在地上一次又一次!!"
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "您還沒有死。您現在只是在休息。"
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "你已經沒有更多"
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "你已不再是."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "你已經過期了,請求助管理員"
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "身體僵硬"
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "失去了生命，您安詳的休息了。"
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "如果你沒有這樣做,你就不會上天堂了!!"
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "你的傳奇已經是過去式了!!"
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr "你折斷了樹枝"
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "你踢了水桶"
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "死掉了...."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "您已是前-玩家。"
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr "你正走向地獄!!"
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr "訊息"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "您已經攜帶超過負重能力的一半。您將無法恢復生命。"
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, fuzzy, c-format
+msgid "You picked up %s."
 msgstr "您已經撿起 "
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:532
 #, fuzzy
 msgid "Equip arrows first."
 msgstr "請先裝備弓箭"
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "交易失敗！"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "顯示表情失敗！"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "坐下休息失敗！"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "聊天新增失敗！"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "不能加入隊伍！"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "無法大叫！"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你還沒達到足夠等級！"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "HP不夠！"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "SP不夠！"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "沒有備忘錄"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "您現在不能那麼做！"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "看來您需要更多錢... ;-)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器無法使用此技能！"
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "你需要再一顆紅寶石!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "你需要再一棵藍寶石!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "你已負重太多，不能再多!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "阿?那是甚麼?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "傳送失敗..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "無法偷取任何物品..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "藥水無效..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 #, fuzzy
 msgid "Request for Trade"
 msgstr "交易的要求"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, fuzzy, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr " 想要跟您交易，您接受嗎？"
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "交易無法進行。交易對象太遠了。"
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "無法進行交易。該角色不存在。"
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr "由於不明的原因已取消交易。"
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, fuzzy, c-format
 msgid "Trade: You and %s"
 msgstr "交易：您和 "
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, fuzzy, c-format
 msgid "Trade with %s cancelled."
 msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 #, fuzzy
 msgid "Unhandled trade cancel packet."
 msgstr "未處理的交易取消封包"
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "加入物品失敗。交易的伙伴已經超重。"
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "加入物品失敗。交易對象沒有空的欄位。"
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr "由於不明的原因加入物品失敗。"
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr "交易已完成。"
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+#, fuzzy
+msgid "Press OK to respawn."
 msgstr " 請按確認啟動"
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
 msgstr "您已經死亡"
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+#, fuzzy
+msgid "Not logged in."
+msgstr "已經登入"
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "名字已經有人使用"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "角色狀態確定"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "玩家已刪除"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "請選擇交易的物品數量"
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "不明的錯誤"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr "沒有可用的遊戲伺服器。"
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "意志力:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, fuzzy, c-format
 msgid "Topic: %s"
 msgstr "主題: "
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+#, fuzzy
+msgid "Players in this channel:"
+msgstr "玩家攻擊怪物"
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "指令: /join <頻道名稱>"
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "不明指令"
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Willpower %+d"
 msgstr "意志力 %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "意志力:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 #, fuzzy
 msgid "Error creating guild."
 msgstr "建立更新目錄失敗！"
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 #, fuzzy
 msgid "Invite sent."
 msgstr "邀請使用者"
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 #, fuzzy
 msgid "Failed to promote member."
 msgstr "使用物品失敗"
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+#, fuzzy
+msgid "Wrong magic_token."
 msgstr "錯誤的魔法代號"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#, fuzzy
+msgid "Already logged in."
 msgstr "已經登入"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Server is full."
 msgstr "伺服器人數已滿"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+#, fuzzy
+msgid "New password incorrect."
 msgstr "新密碼不正確"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr "帳號還沒連線,請先登入"
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+#, fuzzy
+msgid "New email address incorrect."
 msgstr "新的郵件位址不正確"
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+#, fuzzy
+msgid "Old email address incorrect."
 msgstr "舊得郵件位址不正確"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+#, fuzzy
+msgid "The new email address already exists."
 msgstr "電子郵件已經被註冊"
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#, fuzzy
+msgid "Client version is too old."
 msgstr "遊戲版本太老舊!!"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+#, fuzzy
+msgid "Wrong username or password."
 msgstr "錯誤的帳號或密碼"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:303
+#, fuzzy
+msgid "Wrong username, password or email address."
 msgstr "錯誤的帳號或密碼及電子郵件"
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+#, fuzzy
+msgid "Username already exists."
 msgstr "名字已經有人使用"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:309
+#, fuzzy
+msgid "Email address already exists."
 msgstr "電子郵件已經存在"
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, fuzzy, c-format
+msgid "%s rejected your invite."
+msgstr "%s 拒絕您的邀請。"
+
+#: src/net/manaserv/tradehandler.cpp:96
 #, fuzzy
 msgid "Accepting incoming trade requests."
 msgstr "接受收到的交易要求"
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 #, fuzzy
 msgid "Ignoring incoming trade requests."
 msgstr "忽略收到的交易要求"
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, fuzzy, c-format
 msgid "Trading with %s"
 msgstr "交易對象: "
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "@@ignore|完全忽視 %s@@"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -3035,25 +3751,238 @@ msgstr "體力%+d"
 msgid "MP %+d"
 msgstr "魔力%+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr "不明的物品"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "未知物品"
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "未知物品"
 
+#~ msgid "no"
+#~ msgstr "否"
+
+#~ msgid "Buddy"
+#~ msgstr "好友"
+
+#~ msgid "Buddy List"
+#~ msgstr "好友清單"
+
+#~ msgid "Description: %s"
+#~ msgstr "說明：%s"
+
+#~ msgid "Effect: %s"
+#~ msgstr "效果：%s"
+
+#~ msgid "Previous"
+#~ msgstr "上一個"
+
+#~ msgid "New"
+#~ msgstr "新增"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "職業等級：%d"
+
+#~ msgid "Present: "
+#~ msgstr "上線: "
+
+#~ msgid "Quit Guild"
+#~ msgstr "離開公會"
+
+#~ msgid "Ok"
+#~ msgstr "確認"
+
+#~ msgid "Recent:"
+#~ msgstr "記錄的:"
+
+#~ msgid "Magic"
+#~ msgstr "魔法"
+
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "施展測試咒文 1"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "施展測試咒文 2"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "施展測試咒文 3"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "雙手武器"
+
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@交易|與%s交易@@"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@攻擊|攻擊%s@@"
+
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|無視 %s@@"
+
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore| 忽視 %s@@"
+
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore| 不忽視 %s@@"
+
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|踢掉玩家@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@取消|取消@@"
+
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|撿起 %s @@"
+
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@使用|卸下@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@使用|裝備@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@使用|使用@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@丟棄|丟棄@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@分離|分離@@"
+
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|儲存@@"
+
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|檢索@@"
+
+#~ msgid "Select Server"
+#~ msgstr "選擇伺服器"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "無法切換到 "
+
+#~ msgid "windowed"
+#~ msgstr "視窗化"
+
+#~ msgid "fullscreen"
+#~ msgstr "全螢幕"
+
+#~ msgid "Mystery Skill"
+#~ msgstr "神秘技能"
+
+#~ msgid "Weapons"
+#~ msgstr "武器"
+
+#~ msgid "Crafts"
+#~ msgstr "工藝品"
+
+#~ msgid "Stats"
+#~ msgstr "狀態"
+
+#~ msgid "Total"
+#~ msgstr "總共"
+
+#~ msgid "Cost"
+#~ msgstr "需求"
+
+#~ msgid "Attack:"
+#~ msgstr "攻擊:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% 傷害反射："
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "剩餘狀態點數：%d"
+
+#~ msgid "Max level"
+#~ msgstr "最大等級"
+
+#~ msgid "curl error "
+#~ msgstr "curl 錯誤 "
+
+#~ msgid " host: "
+#~ msgstr " 主機: "
+
+#~ msgid "Guilds"
+#~ msgstr "公會"
+
+#~ msgid "Buddys"
+#~ msgstr "好友"
+
+#~ msgid "Party Window"
+#~ msgstr "隊伍視窗"
+
+#~ msgid "Unarmed"
+#~ msgstr "未命名"
+
+#~ msgid "Knife"
+#~ msgstr "小刀"
+
+#~ msgid "Sword"
+#~ msgstr "劍"
+
+#~ msgid "Polearm"
+#~ msgstr "長戰斧"
+
+#~ msgid "Staff"
+#~ msgstr "杖"
+
+#~ msgid "Whip"
+#~ msgstr "鞭子"
+
+#~ msgid "Bow"
+#~ msgstr "弓"
+
+#~ msgid "Shooting"
+#~ msgstr "射擊"
+
+#~ msgid "Mace"
+#~ msgstr "錘"
+
+#~ msgid "Axe"
+#~ msgstr "斧"
+
+#~ msgid "Thrown"
+#~ msgstr "投擲"
+
+#~ msgid "Craft"
+#~ msgstr "工藝品"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "不明的技能"
+
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " 不能建立，但是它也不存在！現在結束。"
+
+#~ msgid "Couldn't set "
+#~ msgstr "無法設定 "
+
+#~ msgid " video mode: "
+#~ msgstr " 視訊模式: "
+
+#~ msgid "mana"
+#~ msgstr "mana"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "正在連接角色伺服器..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "正在連接帳號伺服器..."
+
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > 效果同 create 指令"
+
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "指令： /new <隊伍名稱>"
+
+#~ msgid "Unnamed"
+#~ msgstr "未知物品"
+
 #, fuzzy
 #~ msgid "The Mana World %s"
 #~ msgstr "瑪那世界 "
 
-#~ msgid "Select Character"
-#~ msgstr "選擇角色"
-
 #~ msgid "Unable to load selection.png"
 #~ msgstr "無法讀取所選擇png圖檔"
 
@@ -3063,9 +3992,6 @@ msgstr "未知物品"
 #~ msgid "Slots: "
 #~ msgstr "欄位: "
 
-#~ msgid "Player deleted"
-#~ msgstr "玩家已刪除"
-
 #~ msgid " cancelled"
 #~ msgstr " 已取消"
 
@@ -3075,9 +4001,6 @@ msgstr "未知物品"
 #~ msgid "monsters.xml"
 #~ msgstr "monsters.xml"
 
-#~ msgid "MiniMap"
-#~ msgstr "小地圖"
-
 #~ msgid "@@pickup|Pick Up %s@@"
 #~ msgstr "@@撿起|撿起%s@@"
 
@@ -3195,9 +4118,6 @@ msgstr "未知物品"
 #~ msgid "Agility: %d"
 #~ msgstr "敏捷: %d"
 
-#~ msgid "Vitality: %d"
-#~ msgstr "體力: %d"
-
 #~ msgid "Intelligence: %d"
 #~ msgstr "智力: %d"
 
@@ -3275,9 +4195,3 @@ msgstr "未知物品"
 
 #~ msgid "Keep"
 #~ msgstr "保持"
-
-#~ msgid "+"
-#~ msgstr "增加"
-
-#~ msgid "-"
-#~ msgstr "減少"