Large translation file update

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

1 files changed, 948 insertions, 3483 deletions

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 ""