Fix and extend the german translation.

3 files changed, 8207 insertions, 1828 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d34edc85..e4c7433c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ src/commandhandler.cpp
 src/commandhandler.h
 src/engine.cpp
 src/game.cpp
-src/gui/buddywindow.cpp
 src/gui/buy.cpp
 src/gui/buysell.cpp
 src/gui/changeemaildialog.cpp
@@ -23,7 +22,6 @@ src/gui/inventorywindow.cpp
 src/gui/itemamount.cpp
 src/gui/itempopup.cpp
 src/gui/login.cpp
-src/gui/magic.cpp
 src/gui/minimap.cpp
 src/gui/npcdialog.cpp
 src/gui/npcpostdialog.cpp
@@ -40,10 +38,9 @@ src/gui/sdlinput.cpp
 src/gui/sdlinput.h
 src/gui/sell.cpp
 src/gui/serverdialog.cpp
-src/gui/serverselectdialog.cpp
-src/gui/setup.cpp
 src/gui/setup_audio.cpp
 src/gui/setup_colors.cpp
+src/gui/setup.cpp
 src/gui/setup_joystick.cpp
 src/gui/setup_keyboard.cpp
 src/gui/setup_players.cpp
@@ -60,6 +57,7 @@ src/gui/widgets/channeltab.cpp
 src/gui/widgets/chattab.cpp
 src/gui/widgets/whispertab.cpp
 src/gui/windowmenu.cpp
+src/gui/worldselectdialog.cpp
 src/keyboardconfig.cpp
 src/localplayer.cpp
 src/log.h
@@ -68,18 +66,18 @@ src/net/ea/adminhandler.cpp
 src/net/ea/buysellhandler.cpp
 src/net/ea/charserverhandler.cpp
 src/net/ea/chathandler.cpp
-src/net/ea/equipmenthandler.cpp
+src/net/ea/gamehandler.cpp
 src/net/ea/generalhandler.cpp
 src/net/ea/gui/partytab.cpp
 src/net/ea/inventoryhandler.cpp
 src/net/ea/loginhandler.cpp
-src/net/ea/maphandler.cpp
+src/net/ea/network.cpp
 src/net/ea/partyhandler.cpp
 src/net/ea/playerhandler.cpp
 src/net/ea/specialhandler.cpp
 src/net/ea/tradehandler.cpp
 src/net/manaserv/beinghandler.cpp
-src/net/manaserv/charserverhandler.cpp
+src/net/manaserv/charhandler.cpp
 src/net/manaserv/chathandler.cpp
 src/net/manaserv/generalhandler.cpp
 src/net/manaserv/guildhandler.cpp
diff --git a/po/de.po b/po/de.po
index 794ae958..489dc58b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,14 +2,64 @@
 # Copyright (C) 2007 The Mana World Development Team
 # This file is distributed under the same license as the The Mana World package.
 #
+#: 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
 # Matthias Hartmann <hartmann.matthias@gmail.com>, 2007.
-# Jonathan Raphael Joachim Kolberg, 2009.
+# Jonathan Raphael Joachim Kolberg, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
-"PO-Revision-Date: 2009-12-31 01:01+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-31 15:55+0100\n"
+"PO-Revision-Date: 2010-01-02 15:26+0000\n"
 "Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,206 +69,355 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/commandhandler.cpp:52 src/commandhandler.cpp:184
+#: src/commandhandler.cpp:191 src/gui/widgets/channeltab.cpp:59
+#: src/gui/widgets/whispertab.cpp:77 src/main.cpp:557
+#: src/net/ea/gui/partytab.cpp:67
+msgid "help"
+msgstr "Hilfe"
+
+#: src/commandhandler.cpp:60 src/commandhandler.cpp:195
+msgid "announce"
+msgstr "ankündigen"
+
+#: src/commandhandler.cpp:64 src/commandhandler.cpp:284
+msgid "where"
+msgstr "Wo"
+
+#: src/commandhandler.cpp:68 src/commandhandler.cpp:289
+msgid "who"
+msgstr "Wer"
+
+#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
+msgid "msg"
+msgstr ""
+
+#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
+#: src/gui/popupmenu.cpp:227
+msgid "whisper"
+msgstr "geflüsterte Nachricht"
+
+#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
+msgid "w"
+msgstr ""
+
+#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
+msgid "query"
+msgstr ""
+
+#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
+msgid "q"
+msgstr ""
+
+#: src/commandhandler.cpp:80 src/commandhandler.cpp:207
+#: src/gui/popupmenu.cpp:238 src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:103
+msgid "ignore"
+msgstr "Ignoriere"
+
+#: src/commandhandler.cpp:84 src/commandhandler.cpp:278
+#: src/gui/popupmenu.cpp:231 src/gui/widgets/whispertab.cpp:90
+#: src/gui/widgets/whispertab.cpp:107
+msgid "unignore"
+msgstr "nicht ignorieren"
+
+#: src/commandhandler.cpp:88 src/commandhandler.cpp:213
+#, fuzzy
+msgid "join"
+msgstr "Anmelden"
+
+#: src/commandhandler.cpp:92 src/commandhandler.cpp:219
+#, fuzzy
+msgid "list"
+msgstr "Aufteilen"
+
+#: src/commandhandler.cpp:96 src/commandhandler.cpp:202
+#, fuzzy
+msgid "clear"
+msgstr "Waffenarm"
+
+#: src/commandhandler.cpp:100 src/commandhandler.cpp:245
+#: src/gui/popupmenu.cpp:327
+msgid "party"
+msgstr "Party"
+
+#: src/commandhandler.cpp:104 src/commandhandler.cpp:224
+msgid "me"
+msgstr "ich"
+
+#: src/commandhandler.cpp:108 src/commandhandler.cpp:259
+msgid "record"
+msgstr "nehme auf"
+
+#: src/commandhandler.cpp:112 src/commandhandler.cpp:267
+#: src/commandhandler.cpp:435
+#, fuzzy
+msgid "toggle"
+msgstr "Logger"
+
+#: src/commandhandler.cpp:116 src/commandhandler.cpp:252
+msgid "present"
+msgstr "Anwesend: "
+
+#: src/commandhandler.cpp:122 src/commandhandler.cpp:297
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:130 src/gui/chat.cpp:110
+#: src/gui/statuswindow.cpp:442
+msgid "1"
+msgstr ""
+
+#: src/commandhandler.cpp:131
+msgid "y"
+msgstr ""
+
+#: src/commandhandler.cpp:131
+msgid "Y"
+msgstr ""
+
+#: src/commandhandler.cpp:132
+msgid "t"
+msgstr ""
+
+#: src/commandhandler.cpp:132
+msgid "T"
+msgstr ""
+
+#: src/commandhandler.cpp:134 src/gui/chat.cpp:110 src/gui/chat.cpp:307
+#: src/gui/chat.cpp:309 src/gui/skilldialog.cpp:95
+#: src/gui/widgets/chattab.cpp:171 src/gui/widgets/chattab.cpp:173
+msgid "0"
+msgstr ""
+
+#: src/commandhandler.cpp:135
+msgid "n"
+msgstr "Nein"
+
+#: src/commandhandler.cpp:135
+msgid "N"
+msgstr "Nein"
+
+#: src/commandhandler.cpp:136
+msgid "f"
+msgstr ""
+
+#: src/commandhandler.cpp:136
+msgid "F"
+msgstr ""
+
+#: src/commandhandler.cpp:151
 msgid "-- Help --"
 msgstr "-- Hilfe --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:152
 msgid "/help > Display this help"
 msgstr "/help > diese Hilfe anzeigen"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:154
 msgid "/where > Display map name"
 msgstr "/where > Zeige den Namen der aktuellen Karte"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:155
 msgid "/who > Display number of online users"
 msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:156
 msgid "/me > Tell something about yourself"
 msgstr "/me > Erzähle etwas über Dich"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:158
 msgid "/clear > Clears this window"
 msgstr "/clear > Löscht den Inhalt dieses Fensters"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:160
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:161
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Ersatz für msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:162
 msgid "/w > Alias of msg"
 msgstr "/w > Ersatz für msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:163
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 "/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:164
 msgid "/q > Alias of query"
 msgstr "/q > Ersatz für query"
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:166
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:167
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:169
 msgid "/list > Display all public channels"
 msgstr "/list > Zeige alle öffentlichen Kanäle"
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:170
 msgid "/join > Join or create a channel"
 msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:172
 msgid "/party > Invite a user to party"
 msgstr "/party > Lade einen Benutzer zu deiner Party ein"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:174
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:175
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:176
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
 "das Log aktiviert ist)"
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:178
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Globale Ansage (Nur von GM's nutzbar)"
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:182
 msgid "For more information, type /help <command>."
 msgstr "Für mehr Informationen, gib /help <Befehl> ein."
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:186
 msgid "Command: /help"
 msgstr "Befehl: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:187
 msgid "This command displays a list of all commands available."
 msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:188
 msgid "Command: /help <command>"
 msgstr "Befehl: /help <Befehl>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:189
 msgid "This command displays help on <command>."
 msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:197
 msgid "Command: /announce <msg>"
 msgstr "Befehl: /announce <Nachricht>"
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:198
 msgid "*** only available to a GM ***"
 msgstr "*** Nur für GMs verfügbar ***"
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:199
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
 "online sind."
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:204
 msgid "Command: /clear"
 msgstr "Befehl: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:205
 msgid "This command clears the chat log of previous chat."
 msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:209
+msgid "Command: /ignore <player>"
+msgstr "Befehl: /item <Wert>"
+
+#: src/commandhandler.cpp:210
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+
+#: src/commandhandler.cpp:215
 msgid "Command: /join <channel>"
 msgstr "Befehl: /join <Kanal>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:216
 msgid "This command makes you enter <channel>."
 msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:217
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:221
 msgid "Command: /list"
 msgstr "Befehl: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:222
 msgid "This command shows a list of all channels."
 msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:226
 msgid "Command: /me <message>"
 msgstr "Befehl: /me <Nachricht>"
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:227
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:231
 msgid "Command: /msg <nick> <message>"
 msgstr "Befehl: /msg <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:232
 msgid "Command: /whisper <nick> <message>"
 msgstr "Befehl: /whisper <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:233
 msgid "Command: /w <nick> <message>"
 msgstr "Befehl: /w <Name> <Nachricht>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:234
 msgid "This command sends the text <message> to <nick>."
 msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
 
-#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
-#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
+#: src/commandhandler.cpp:235 src/commandhandler.cpp:249
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
 "(\")."
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:240
 msgid "Command: /query <nick>"
 msgstr "Befehl: /query <Name>"
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:241
 msgid "Command: /q <nick>"
 msgstr "Befehl: /q <Name>"
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:242
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 "Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
 "und Spieler <Name>."
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:247
 msgid "Command: /party <nick>"
 msgstr "Befehl: /party <Name>"
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:248 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:254
 msgid "Command: /present"
 msgstr "Befehl: /present"
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:255
 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."
@@ -227,29 +426,29 @@ msgstr ""
 "sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
 "Chatfenster an."
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:261
 msgid "Command: /record <filename>"
 msgstr "Befehl: /record <Dateiname>"
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:262
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
 "<Dateiname>."
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:264
 msgid "Command: /record"
 msgstr "Befehl: /record"
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:265
 msgid "This command finishes a recording session."
 msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:269
 msgid "Command: /toggle <state>"
 msgstr "Befehl: /toggle <Status>"
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:270
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -258,7 +457,7 @@ msgstr ""
 "eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
 "gedrückt wurde."
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:272
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
@@ -266,39 +465,68 @@ msgstr ""
 "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  \"0\","
 "\"no\",\"false\" deaktiviert es."
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:275
 msgid "Command: /toggle"
 msgstr "Befehl: /toggle"
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:276
 msgid "This command displays the return toggle status."
 msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:280 src/gui/widgets/whispertab.cpp:92
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Befehl: /item <Wert>"
+
+#: src/commandhandler.cpp:281
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:286
 msgid "Command: /where"
 msgstr "Befehl: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:287
 msgid "This command displays the name of the current map."
 msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:291
 msgid "Command: /who"
 msgstr "Befehl: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:292
 msgid "This command displays the number of players currently online."
 msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:298
 msgid "Type /help for a list of commands."
 msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:305
+msgid ", coordinates: "
+msgstr ", Koordinaten: "
+
+#: src/commandhandler.cpp:306 src/gui/chat.cpp:289
+msgid ", "
+msgstr ""
+
+#: src/commandhandler.cpp:322 src/net/ea/network.cpp:343
+msgid "\""
+msgstr ""
+
+#: src/commandhandler.cpp:334 src/gui/chat.cpp:405
+#: src/gui/outfitwindow.cpp:125 src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:122 src/gui/widgets/chattab.cpp:136
+#: src/net/ea/specialhandler.cpp:166 src/net/manaserv/beinghandler.cpp:288
+#, fuzzy
+msgid " "
+msgstr "; "
+
+#: src/commandhandler.cpp:364
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:372
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -307,56 +535,157 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:386
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:400 src/commandhandler.cpp:448
+#: src/commandhandler.cpp:470
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:418
 msgid "Return toggles chat."
 msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:418
 msgid "Message closes chat."
 msgstr "Nachricht schließt Chatzeile."
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:427
 msgid "Return now toggles chat."
 msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:431
 msgid "Message now closes chat."
 msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
+#: src/commandhandler.cpp:454
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:461
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "Party erfolgreich erstellt."
+
+#: src/commandhandler.cpp:463
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+
+#: src/commandhandler.cpp:478
+msgid "Player wasn't ignored!"
+msgstr "Spieler wurde nicht ignoriert!"
+
+#: src/commandhandler.cpp:483
+msgid "Player no longer ignored!"
+msgstr "Spieler wird nicht länger ignoriert!"
+
+#: src/commandhandler.cpp:485
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/engine.cpp:88
-msgid "Could not load map"
-msgstr "Karte konnte nicht geladen werden"
+#: src/engine.cpp:80
+msgid "maps/"
+msgstr ""
+
+#: src/engine.cpp:80
+msgid ".tmx"
+msgstr ""
+
+#: src/engine.cpp:83
+msgid ".gz"
+msgstr ""
 
-#: src/engine.cpp:89
+#: src/engine.cpp:90 src/engine.cpp:92
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: src/game.cpp:237
+#: src/engine.cpp:91
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Karte konnte nicht geladen werden"
+
+#: src/game.cpp:233
+#, fuzzy
+msgid "ItemShortcut"
+msgstr "Kurztaste %d"
+
+#: src/game.cpp:235
+#, fuzzy
+msgid "EmoteShortcut"
+msgstr "Gefühlstaste %d"
+
+#: src/game.cpp:240
 msgid "General"
 msgstr "Öffentlich"
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:242
+#, fuzzy
+msgid "logToChat"
+msgstr "Chat"
+
+#: src/game.cpp:305 src/net/ea/playerhandler.cpp:195
+msgid "."
+msgstr ""
+
+#: src/game.cpp:324 src/game.cpp:325 src/game.cpp:421
+#: src/gui/setup_video.cpp:188 src/gui/setup_video.cpp:401 src/main.cpp:325
+#, fuzzy
+msgid "fpslimit"
+msgstr "Aufteilen"
+
+#: src/game.cpp:365
+msgid "Desktop"
+msgstr ""
+
+#: src/game.cpp:391 src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:390
+#: src/gui/statuswindow.cpp:418 src/gui/updatewindow.cpp:330
+#: src/gui/updatewindow.cpp:341 src/gui/updatewindow.cpp:345
+#: src/gui/updatewindow.cpp:367 src/gui/updatewindow.cpp:392
+#: src/gui/updatewindow.cpp:427 src/gui/updatewindow.cpp:442
+#: src/gui/updatewindow.cpp:472 src/main.cpp:236 src/main.cpp:238
+#: src/main.cpp:242 src/main.cpp:247 src/main.cpp:1012
+msgid "/"
+msgstr ""
+
+#: src/game.cpp:392
+#, fuzzy
+msgid "Mana_Screenshot_"
+msgstr "Bildschirmfoto"
+
+#: src/game.cpp:392
+msgid ".png"
+msgstr ""
+
+#: src/game.cpp:405
+#, fuzzy
+msgid "Screenshot saved as "
 msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
 
-#: src/game.cpp:409
+#: src/game.cpp:410
 msgid "Saving screenshot failed!"
 msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:411
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: src/game.cpp:486
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr ""
 "Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
 
@@ -364,259 +693,497 @@ msgstr ""
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
-msgstr "Beenden"
+#: src/game.cpp:534 src/game.cpp:896
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
-msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+#: src/game.cpp:564 src/gui/changeemaildialog.cpp:55
+#: src/gui/changeemaildialog.cpp:105 src/gui/changepassworddialog.cpp:58
+#: src/gui/changepassworddialog.cpp:86 src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:182 src/gui/itemamount.cpp:101
+#: src/gui/itemamount.cpp:181 src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:96 src/gui/popupmenu.cpp:347
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/register.cpp:145
+#: src/gui/trade.cpp:287 src/gui/unregisterdialog.cpp:56
+#: src/gui/unregisterdialog.cpp:86 src/gui/unregisterdialog.cpp:97
+#: src/gui/updatewindow.cpp:144 src/gui/updatewindow.cpp:210
+#, fuzzy
+msgid "cancel"
+msgstr "Abbrechen"
 
-#: src/game.cpp:665
-msgid "no"
-msgstr "Nein"
+#: src/game.cpp:567 src/gui/itemamount.cpp:100 src/gui/itemamount.cpp:201
+#: src/gui/npcdialog.cpp:93 src/gui/npcdialog.cpp:154 src/gui/okdialog.cpp:42
+#: src/gui/okdialog.cpp:80 src/gui/quitdialog.cpp:46
+#: src/gui/quitdialog.cpp:105 src/gui/register.cpp:53
+#: src/gui/serverdialog.cpp:186 src/gui/trade.cpp:232 src/gui/trade.cpp:295
+#: src/main.cpp:984
+msgid "ok"
+msgstr ""
+
+#: src/game.cpp:707
+#, fuzzy
+msgid "index"
+msgstr "Im Fenster"
 
-#: src/game.cpp:805
+#: src/game.cpp:853
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/game.cpp:812
+#: src/game.cpp:860
 msgid "Accepting incoming trade requests"
 msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
-msgstr "Freund"
-
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
-msgstr "Freundesliste"
-
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/buy.cpp:47 src/gui/buy.cpp:50 src/gui/buy.cpp:76
+#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:86
 msgid "Buy"
 msgstr "Kaufen"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: 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
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preis: %s / Gesamt: %s"
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
+#: 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
+msgid "+"
+msgstr "+"
+
+#: src/gui/buy.cpp:72 src/gui/buy.cpp:169 src/gui/itemamount.cpp:99
+#: src/gui/itemamount.cpp:185 src/gui/npcdialog.cpp:96
+#: src/gui/npcdialog.cpp:213 src/gui/sell.cpp:72 src/gui/sell.cpp:164
+#: src/gui/skilldialog.cpp:112 src/gui/skilldialog.cpp:241
+#: src/gui/statuswindow.cpp:479
+msgid "inc"
+msgstr "Verringern"
+
+#: src/gui/buy.cpp:75 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:97
+#: src/gui/sell.cpp:73 src/gui/statuswindow.cpp:491
+msgid "-"
+msgstr "-"
+
+#: src/gui/buy.cpp:75 src/gui/buy.cpp:175 src/gui/itemamount.cpp:98
+#: src/gui/itemamount.cpp:189 src/gui/npcdialog.cpp:97
+#: src/gui/npcdialog.cpp:217 src/gui/sell.cpp:73 src/gui/sell.cpp:170
+#: src/gui/statuswindow.cpp:491
+msgid "dec"
+msgstr ""
+
+#: src/gui/buy.cpp:76 src/gui/buy.cpp:190
+#, fuzzy
+msgid "buy"
+msgstr "Kaufen"
+
+#: src/gui/buy.cpp:77 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:75 src/gui/serverdialog.cpp:127
+#: src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/gui/buy.cpp:77 src/gui/buy.cpp:149 src/gui/sell.cpp:75
+#: src/gui/sell.cpp:144 src/gui/serverdialog.cpp:127
+#: src/gui/serverdialog.cpp:244 src/gui/widgets/channeltab.cpp:71
+#: src/gui/widgets/channeltab.cpp:109
+#, fuzzy
+msgid "quit"
+msgstr "Beenden"
+
+#: src/gui/buy.cpp:78 src/gui/sell.cpp:76 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
 msgid "Max"
 msgstr "Max"
 
-#: src/gui/buy.cpp:73 src/gui/buy.cpp:223 src/gui/buy.cpp:241
-#: src/gui/sell.cpp:75 src/gui/sell.cpp:250 src/gui/sell.cpp:264
+#: src/gui/buy.cpp:78 src/gui/buy.cpp:181 src/gui/sell.cpp:76
+#: src/gui/sell.cpp:176 src/gui/setup_video.cpp:173
+msgid "max"
+msgstr "max"
+
+#: src/gui/buy.cpp:79 src/gui/buy.cpp:229 src/gui/buy.cpp:247
+#: src/gui/sell.cpp:77 src/gui/sell.cpp:252 src/gui/sell.cpp:266
 #, c-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: src/gui/buy.cpp:74 src/gui/buy.cpp:225 src/gui/buy.cpp:242
-#: src/gui/sell.cpp:76 src/gui/sell.cpp:252 src/gui/sell.cpp:265
+#: src/gui/buy.cpp:80 src/gui/buy.cpp:231 src/gui/buy.cpp:248
+#: src/gui/sell.cpp:78 src/gui/sell.cpp:254 src/gui/sell.cpp:267
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
 
-#: src/gui/buysell.cpp:34
+#: 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 "Geschäft"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:38
+#, fuzzy
+msgid "BuySell"
+msgstr "Verkaufen"
+
+#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:90 src/gui/sell.cpp:47
+#: src/gui/sell.cpp:50 src/gui/sell.cpp:74
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp: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/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr "Email-Adresse ändern"
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Account: %s"
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
-msgstr "Gib die neue Email Adresse zweimal ein:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Gib die neue E-Mailadresse zweimal ein:"
+
+#: src/gui/changeemaildialog.cpp:54 src/gui/changeemaildialog.cpp:94
+#: src/gui/changeemaildialog.cpp:95 src/gui/changeemaildialog.cpp:109
+#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:213
+msgid "change_email"
+msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: 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."
+msgstr "Die neue E-Mailadresse muss aus mindestens %d Zeichen bestehen."
+
+#: src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Die neuen E-Mailadresse stimmen nicht überein."
+
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:196 src/gui/unregisterdialog.cpp:134
+#: src/main.cpp:1110 src/main.cpp:1117 src/main.cpp:1252
+#: src/net/ea/charserverhandler.cpp:129 src/net/ea/charserverhandler.cpp:148
+#: src/net/manaserv/charhandler.cpp:127 src/net/manaserv/charhandler.cpp:229
+msgid "Error"
+msgstr "Fehler"
+
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:56 src/gui/changepassworddialog.cpp:74
+#: src/gui/changepassworddialog.cpp:75 src/gui/changepassworddialog.cpp:76
+#: src/gui/changepassworddialog.cpp:90 src/gui/charselectdialog.cpp:128
+#: src/gui/charselectdialog.cpp:209
+msgid "change_password"
+msgstr "Passwort ändern"
+
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr "Gib dein neues Passwort zweimal ein:"
 
+#: src/gui/changepassworddialog.cpp:97
+#, c-format
+msgid "ChangePasswordDialog::Password change, Username is %s"
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Das neue Passwort muss aus mindestens %d Zeichen bestehen."
+
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Die neues Passwörter stimmen nicht überein."
+
 #: src/gui/charcreatedialog.cpp:54
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:68 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Name :"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
-msgstr "Haarfarbe"
+#: src/gui/charcreatedialog.cpp:71 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+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
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:189
+msgid "prevcolor"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
-msgstr "Frisur"
+#: src/gui/charcreatedialog.cpp:75
+msgid "Hair color:"
+msgstr "Haarfarbe:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: 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
+msgid "Hair style:"
+msgstr "Frisur:"
+
+#: src/gui/charcreatedialog.cpp:79 src/gui/charselectdialog.cpp:364
 msgid "Create"
 msgstr "Erstellen"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:97
+#: src/gui/charcreatedialog.cpp:158 src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:110
+msgid "create"
+msgstr "Erstellen"
+
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:90
 msgid "Male"
 msgstr "Männlich"
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:87 src/gui/charcreatedialog.cpp:88
+#: src/gui/charcreatedialog.cpp:207 src/resources/itemdb.cpp:291
+msgid "gender"
+msgstr "Geschlecht"
+
+#: src/gui/charcreatedialog.cpp:82 src/gui/register.cpp:91
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:100 src/gui/charcreatedialog.cpp:245
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Fehler"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:204 src/gui/charcreatedialog.cpp:303
+msgid "statslider"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:237
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:249
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:67
 msgid "Confirm Character Delete"
 msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:68
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:76 src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:90 src/gui/guildwindow.cpp:171
+#: src/gui/partywindow.cpp:206 src/gui/updatewindow.cpp:74
+#: src/net/ea/tradehandler.cpp:53 src/net/manaserv/tradehandler.cpp:60
+msgid "yes"
+msgstr "Ja"
+
+#: src/gui/charselectdialog.cpp:119
 msgid "Account and Character Management"
 msgstr "Account- und Charakterverwaltung"
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
-msgstr "Ok"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr "Login wechseln"
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Zurück"
+#: src/gui/charselectdialog.cpp:127 src/gui/charselectdialog.cpp:187
+msgid "switch"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Weiter"
+#: src/gui/charselectdialog.cpp:146 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Abmelden"
 
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Name : %s"
+#: src/gui/charselectdialog.cpp:147 src/gui/charselectdialog.cpp:217
+#: src/gui/unregisterdialog.cpp:55 src/gui/unregisterdialog.cpp:101
+#, fuzzy
+msgid "unregister"
+msgstr "Abmelden"
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Stufe: %d"
+#: src/gui/charselectdialog.cpp:154
+msgid "Change Email"
+msgstr "E-Mailadresse ändern"
+
+#: src/gui/charselectdialog.cpp:183 src/gui/charselectdialog.cpp:355
+#: src/gui/inventorywindow.cpp:81 src/gui/inventorywindow.cpp:178
+#: src/gui/popupmenu.cpp:282 src/gui/specialswindow.cpp:109
+#: src/gui/specialswindow.cpp:213
+msgid "use"
+msgstr "benutze"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
+#: src/gui/charselectdialog.cpp:192 src/gui/charselectdialog.cpp:365
+#: src/net/ea/gui/partytab.cpp:69 src/net/ea/gui/partytab.cpp:110
+msgid "new"
 msgstr "Neu"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:202 src/gui/charselectdialog.cpp:310
+#: src/gui/setup_players.cpp:213
+msgid "delete"
+msgstr "Löschen"
+
+#: src/gui/charselectdialog.cpp:305 src/gui/charselectdialog.cpp:308
+msgid "wwwwwwwww"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:305
+msgid "go"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:306
+msgid "wwwwwwwwwwwwwwwwwwwwwwww"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:307
+msgid "(888)"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:310 src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Abmelden"
+#: src/gui/charselectdialog.cpp:354
+msgid "Choose"
+msgstr "Wähle"
 
-#: src/gui/charselectdialog.cpp:119
+#: src/gui/charselectdialog.cpp:356
 #, c-format
-msgid "Money: %d"
-msgstr "Geld: %d"
+msgid "%s"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
+#: src/gui/charselectdialog.cpp:357
 #, c-format
-msgid "Job Level: %d"
-msgstr "Beruf Stufe: %d"
+msgid "Level %d"
+msgstr "Stufe: %d"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
-msgstr "Geld: %s"
+#: src/gui/charselectdialog.cpp:366 src/gui/charselectdialog.cpp:367
+msgid "(empty)"
+msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:75 src/gui/chat.cpp:79 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:96 src/gui/chat.cpp:179
+msgid "chatinput"
+msgstr ""
+
+#: src/gui/chat.cpp:110 src/gui/chat.cpp:117
+#, fuzzy
+msgid "ReturnToggles"
+msgstr "Enter-Taste schließt Chatzeile."
+
+#: src/gui/chat.cpp:296
 #, c-format
-msgid "%d players are present."
-msgstr "%d Spieler sind anwesend."
+msgid "Present: %s; %d players are present."
+msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr "Anwesend: "
+#: src/gui/chat.cpp:307 src/gui/chat.cpp:416 src/gui/widgets/chattab.cpp:171
+msgid "["
+msgstr ""
 
-#: src/gui/chat.cpp:344
+#: 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
 msgid "Attendance written to record log."
 msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:416
+msgid "]"
+msgstr ""
+
+#: src/gui/chat.cpp:456 src/gui/setup_players.cpp:229
+#: src/gui/setup_players.cpp:336 src/gui/setup_players.cpp:341
+msgid "whispertab"
+msgstr "geflüsterte Nachricht"
+
+#: src/gui/chat.cpp:472
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
 
+#: src/gui/chat.cpp:477 src/gui/widgets/chattab.cpp:83
+#: src/gui/widgets/chattab.cpp:201 src/net/ea/chathandler.cpp:120
+#: src/net/ea/chathandler.cpp:146 src/net/ea/chathandler.cpp:176
+#: src/net/manaserv/chathandler.cpp:161
+#, fuzzy
+msgid " : "
+msgstr " host: "
+
 #: src/gui/confirmdialog.cpp:42
 msgid "Yes"
 msgstr "Ja"
@@ -625,167 +1192,438 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nein"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
+#: src/gui/confirmdialog.cpp:43 src/gui/confirmdialog.cpp:90
+#: src/gui/partywindow.cpp:213
+msgid "no"
+msgstr "Nein"
+
+#: src/gui/connectiondialog.cpp:34 src/net/ea/charserverhandler.cpp:142
+#: src/net/manaserv/charhandler.cpp:108
+msgid "Info"
+msgstr "Info"
+
+#: src/gui/connectiondialog.cpp:38
+msgid "cancelButton"
+msgstr ""
+
+#: src/gui/connectiondialog.cpp:40 src/gui/updatewindow.cpp:142
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
+#: src/gui/connectiondialog.cpp:56
+msgid "Cancel pressed"
+msgstr "Abbrechen wurde gedrückt"
+
+#: src/gui/debugwindow.cpp:43 src/gui/debugwindow.cpp:45
+msgid "Debug"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:65, c-format
+msgid "Music: %s"
+msgstr "Musik: %s"
+
+#: src/gui/debugwindow.cpp:66, c-format
+msgid "Map: %s"
+msgstr "Karte : %s"
+
+#: src/gui/debugwindow.cpp:67
+#, c-format
+msgid "Minimap: %s"
+msgstr "Übersichtskarte: %s"
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:96
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle count: %d"
+msgstr "Partikelzählung: %d"
+
+#: src/gui/debugwindow.cpp:104
+msgid "Music: "
+msgstr "Lautstärke der Musik: "
+
+#: src/gui/debugwindow.cpp:104 src/gui/setup_audio.cpp:54
+#: src/gui/setup_audio.cpp:140 src/gui/updatewindow.cpp:459
+msgid "music"
+msgstr "Musik"
+
+#: src/gui/debugwindow.cpp:108
+msgid "Minimap: "
+msgstr "Übersichtskarte: "
+
+#: src/gui/debugwindow.cpp:108 src/gui/minimap.cpp:100
+msgid "minimap"
+msgstr "Übersichtskarte"
+
+#: src/gui/debugwindow.cpp:112
+msgid "Map: "
+msgstr "Karte: "
+
+#: src/gui/debugwindow.cpp:112
+#, fuzzy
+msgid "_filename"
+msgstr "Sichtbare Namen"
+
+#: src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Partikeldetails: %s"
+
+#: src/gui/debugwindow.cpp:126
+#, c-format
+msgid "Ambient FX: %s"
+msgstr "Hintergrundeffekte: %s"
+
+#: src/gui/equipmentwindow.cpp:68 src/gui/equipmentwindow.cpp:80
+#: src/gui/windowmenu.cpp:56 src/gui/windowmenu.cpp:114
 msgid "Equipment"
 msgstr "Ausrüstung"
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
+#: 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
 msgid "Unequip"
 msgstr "Ablegen"
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
+#: src/gui/equipmentwindow.cpp:86 src/gui/equipmentwindow.cpp:157
+#: src/gui/outfitwindow.cpp:72 src/gui/outfitwindow.cpp:155
+msgid "unequip"
+msgstr "Ausziehen"
+
+#: src/gui/guildwindow.cpp:53 src/gui/guildwindow.cpp:56
+#: src/gui/guildwindow.cpp:57
 msgid "Guild"
 msgstr "Gilde"
 
-#: src/gui/guildwindow.cpp:63
+#: src/gui/guildwindow.cpp:67
 msgid "Create Guild"
 msgstr "Gilde erstellen"
 
-#: src/gui/guildwindow.cpp:64
+#: src/gui/guildwindow.cpp:67 src/gui/guildwindow.cpp:113
+msgid "CREATE_GUILD"
+msgstr ""
+
+#: src/gui/guildwindow.cpp:68
 msgid "Invite User"
 msgstr "Spieler einladen"
 
-#: src/gui/guildwindow.cpp:65
+#: src/gui/guildwindow.cpp:68 src/gui/guildwindow.cpp:122
+msgid "INVITE_USER"
+msgstr ""
+
+#: src/gui/guildwindow.cpp:69
 msgid "Quit Guild"
 msgstr "Gilde verlassen"
 
-#: src/gui/help.cpp:34
+#: src/gui/guildwindow.cpp:69 src/gui/guildwindow.cpp:131
+msgid "QUIT_GUILD"
+msgstr ""
+
+#: src/gui/guildwindow.cpp:117
+msgid "Guild Name"
+msgstr "Gildenname"
+
+#: src/gui/guildwindow.cpp:118
+msgid "Choose your guild's name."
+msgstr "Wähle den Namen deiner Gilde"
+
+#: src/gui/guildwindow.cpp:119 src/gui/guildwindow.cpp:141
+msgid "CREATE_GUILD_OK"
+msgstr ""
+
+#: src/gui/guildwindow.cpp:126
+msgid "Member Invite"
+msgstr "Spieler einladen"
+
+#: src/gui/guildwindow.cpp:127
+msgid "Who would you like to invite?"
+msgstr "Wen möchtest du einladen?"
+
+#: src/gui/guildwindow.cpp:128 src/gui/guildwindow.cpp:158
+msgid "INVITE_USER_OK"
+msgstr ""
+
+#: src/gui/guildwindow.cpp:137
+#, c-format
+msgid "Guild %s quit."
+msgstr "Gilde %s wurde aufgelöst."
+
+#: src/gui/guildwindow.cpp:154
+#, c-format
+msgid "Creating guild called %s."
+msgstr "Erstelle der Gilde %s."
+
+#: src/gui/guildwindow.cpp:168
+#, c-format
+msgid "Invited user %s."
+msgstr "Spieler %s einladen"
+
+#: src/gui/guildwindow.cpp:173
+msgid "Sending invitation acceptance."
+msgstr ""
+
+#: src/gui/guildwindow.cpp:245
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
+
+#: src/gui/guildwindow.cpp:249
+msgid "Accept Guild Invite"
+msgstr "Nehme Gildeneinladung an"
+
+#: src/gui/help.cpp:35 src/gui/help.cpp:40
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:49 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:70
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/help.cpp:49 src/gui/help.cpp:69 src/gui/skilldialog.cpp:119
+#: src/gui/specialswindow.cpp:123 src/gui/storagewindow.cpp:70
+#: src/gui/storagewindow.cpp:148 src/gui/widgets/whispertab.cpp:61
+#: src/gui/widgets/whispertab.cpp:79 src/gui/widgets/whispertab.cpp:99
+msgid "close"
+msgstr "Schließen"
+
+#: src/gui/help.cpp:85
+msgid "header"
+msgstr ""
+
+#: src/gui/help.cpp:96
+msgid "help/"
+msgstr "Hilfe"
+
+#: src/gui/help.cpp:96
+msgid ".txt"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:55 src/gui/inventorywindow.cpp:60
+#: src/gui/windowmenu.cpp:57 src/gui/windowmenu.cpp:118
 msgid "Inventory"
 msgstr "Inventar"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:71 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:285 src/gui/popupmenu.cpp:372
 msgid "Equip"
 msgstr "Ausrüsten"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: 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
 msgid "Use"
 msgstr "Benutzen"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:82 src/gui/inventorywindow.cpp:293
+#: src/gui/popupmenu.cpp:378
+msgid "Drop..."
+msgstr "Wegwerfen"
+
+#: src/gui/inventorywindow.cpp:82 src/gui/inventorywindow.cpp:190
+#: src/gui/popupmenu.cpp:309
+msgid "drop"
 msgstr "Wegwerfen"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:83 src/gui/popupmenu.cpp:384
 msgid "Split"
 msgstr "Aufteilen"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:194
+#: src/gui/popupmenu.cpp:303
+msgid "split"
+msgstr "Aufteilen"
+
+#: src/gui/inventorywindow.cpp:84 src/gui/outfitwindow.cpp:50
+#: src/gui/outfitwindow.cpp:60
+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
 msgid "Slots:"
 msgstr "Plätze:"
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:96
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: src/gui/inventorywindow.cpp:154 src/gui/storagewindow.cpp:83
+#: src/gui/storagewindow.cpp:121
+#, c-format
+msgid "%d/%d"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:155
+#, c-format
+msgid "%s/%s"
+msgstr "%s: %s"
+
+#: src/gui/inventorywindow.cpp:295 src/gui/popupmenu.cpp:380
+msgid "Drop"
+msgstr "Wegwerfen"
+
+#: src/gui/itemamount.cpp:90 src/gui/itemamount.cpp:197
+msgid "slide"
+msgstr ""
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:36
+#: src/gui/textdialog.cpp:77 src/gui/trade.cpp:74 src/gui/trade.cpp:76
+msgid "OK"
 msgstr "Ok"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:102 src/gui/itemamount.cpp:193
+msgid "all"
+msgstr "alle"
+
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wie viele Gegenstände du einlagern möchtest."
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wie viele Gegenstände du wieder haben möchtest."
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
 
+#: src/gui/itempopup.cpp:40
+msgid "ItemPopup"
+msgstr ""
+
 #: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr "Gewicht: "
+#, c-format
+msgid "Weight: %s"
+msgstr "Gewicht: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
-msgstr "Letzter Server:"
-
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr "Benutzernamen merken"
+#: src/gui/login.cpp:58
+msgid "Remember username"
+msgstr "Benutzername merken"
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr "Magie"
+#: src/gui/login.cpp:59 src/gui/login.cpp:116 src/gui/register.cpp:73
+#: src/gui/register.cpp:122 src/gui/register.cpp:123 src/gui/register.cpp:124
+#: src/gui/register.cpp:149
+msgid "register"
+msgstr "Registrieren"
 
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr "Spruch 1 sprechen"
+#: src/gui/login.cpp:60
+msgid "Change Server"
+msgstr "Wechsle den Server"
 
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr "Spruch 2 sprechen"
+#: src/gui/login.cpp:60 src/gui/login.cpp:112 src/gui/serverdialog.cpp:372
+#: src/main.cpp:561
+msgid "server"
+msgstr "Server"
 
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr "Spruch 3 sprechen"
+#: src/gui/login.cpp:61 src/gui/login.cpp:63 src/gui/login.cpp:64
+#: src/gui/login.cpp:100 src/gui/worldselectdialog.cpp:76
+#: src/gui/worldselectdialog.cpp:121
+msgid "login"
+msgstr "Anmelden"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Karte"
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/minimap.cpp:51
+msgid "Minimap"
+msgstr "Übersichtskarte"
+
+#: src/gui/minimap.cpp:52 src/gui/minimap.cpp:71
+msgid "Show"
+msgstr "Zeigen"
+
+#: src/gui/npcdialog.cpp:43
 msgid "Waiting for server"
 msgstr "Warte auf den Server"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:44
+msgid "Next"
+msgstr "Weiter"
+
+#: src/gui/npcdialog.cpp:46
 msgid "Submit"
 msgstr "Absenden"
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:56
+msgid "NpcText"
+msgstr "NpcText"
+
+#: src/gui/npcdialog.cpp:106
 msgid "Reset"
 msgstr "Zurücksetzten"
 
+#: src/gui/npcdialog.cpp:106 src/gui/npcdialog.cpp:202
+msgid "reset"
+msgstr "Zurücksetzten"
+
+#: src/gui/npcdialog.cpp:134 src/gui/setup_video.cpp:461
+#: src/gui/updatewindow.cpp:265 src/gui/updatewindow.cpp:269
+msgid "\n"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:160
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"Weiter\n"
+
+#: src/gui/npcdialog.cpp:195 src/gui/setup_colors.cpp:385
+#: src/gui/trade.cpp:323
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:199
+#, c-format
+msgid ""
+"\n"
+"> \"%s\"\n"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:44
 msgid "To:"
 msgstr "Nach:"
@@ -794,10 +1632,57 @@ msgstr "Nach:"
 msgid "Send"
 msgstr "Senden"
 
+#: src/gui/npcpostdialog.cpp:51 src/gui/npcpostdialog.cpp:81
+msgid "send"
+msgstr "Senden"
+
 #: src/gui/npcpostdialog.cpp:85
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang den Brief zu senden oder er war ungültig."
 
+#: src/gui/outfitwindow.cpp:65 src/gui/outfitwindow.cpp:145
+msgid "previous"
+msgstr "Zurück"
+
+#: src/gui/outfitwindow.cpp:66 src/gui/outfitwindow.cpp:135
+msgid "next"
+msgstr "Weiter"
+
+#: src/gui/outfitwindow.cpp:67 src/gui/outfitwindow.cpp:142
+#: src/gui/outfitwindow.cpp:152
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:69
+msgid "Unequip first"
+msgstr "erstes ausziehen"
+
+#: src/gui/outfitwindow.cpp:70
+msgid "OutfitUnequip0"
+msgstr "Ausziehen"
+
+#: src/gui/outfitwindow.cpp:99 src/gui/outfitwindow.cpp:127
+msgid "Outfit"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:99 src/gui/skilldialog.cpp:203
+#: src/gui/specialswindow.cpp:187
+msgid "-1"
+msgstr "-1"
+
+#: src/gui/outfitwindow.cpp:113 src/gui/outfitwindow.cpp:128
+msgid "OutfitUnequip"
+msgstr "Ausziehen"
+
+#: src/gui/palette.cpp:51
+msgid "Color"
+msgstr "Farbe"
+
+#: src/gui/palette.cpp:80
+msgid "  "
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr "Text"
@@ -814,341 +1699,428 @@ msgstr "Textaußenlinie"
 msgid "Progress Bar Labels"
 msgstr "Fortschrittsbalkenbeschriftungen"
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr "Buttons"
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr "Deaktivierte Buttons"
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr "Tabs"
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr "Hervorgehoben"
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr "Hervorgehobener Tab"
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr "Gegenstand ist zu teuer"
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr "Gegenstand ist in Verwendung"
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr "GM"
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr "Spieler"
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr "geflüsterte Nachricht"
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr "Handlungen"
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/gui/partywindow.cpp:55
+#: src/gui/partywindow.cpp:57 src/gui/partywindow.cpp:83
+#: src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/chathandler.cpp:98
 msgid "Server"
 msgstr "Server"
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:103
 msgid "Logger"
 msgstr "Logger"
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:104
 msgid "Hyperlink"
 msgstr "Verknüpfung"
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:106
 msgid "Being"
 msgstr "Aktionen"
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:107
 msgid "Other Players' Names"
 msgstr "Namen anderer Spieler"
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:108
 msgid "Own Name"
 msgstr "Eigener Name"
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:109
 msgid "GM Names"
 msgstr "Namen von GM"
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:110
 msgid "NPCs"
 msgstr "NPCs"
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:111
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:113
 msgid "Unknown Item Type"
 msgstr "Unbekannter Gegenstand"
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:114
 msgid "Generics"
 msgstr "Allgemeiner Gegenstand"
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:115
 msgid "Hats"
 msgstr "Hüte"
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:116
 msgid "Usables"
 msgstr "Benutzbare Gegenstände"
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:117
 msgid "Shirts"
 msgstr "Hemden"
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
-msgstr "einhändige Waffen"
+#: src/gui/palette.cpp:118
+msgid "One Handed Weapons"
+msgstr "Einhänder"
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:119
 msgid "Pants"
 msgstr "Hosen"
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:120
 msgid "Shoes"
 msgstr "Schuhe"
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
-msgstr "zweihändige Waffen"
+#: src/gui/palette.cpp:121
+msgid "Two Handed Weapons"
+msgstr "Zweihänder"
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:122
 msgid "Shields"
 msgstr "Schilde"
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:123
 msgid "Rings"
 msgstr "Ringe"
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:124
 msgid "Necklaces"
 msgstr "Halsketten"
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:125
 msgid "Arms"
 msgstr "Waffen"
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:126
 msgid "Ammo"
 msgstr "Munition"
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:128
 msgid "Particle Effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:129
 msgid "Pickup Notification"
 msgstr "aufgehobene Gegenstände"
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:130
 msgid "Exp Notification"
 msgstr "Anzeige der Erfahrungspunkte"
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:132
+msgid "Player Hits Monster"
 msgstr "Spieler trifft Monster"
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:134
+msgid "Monster Hits Player"
 msgstr "Monster trifft Spieler"
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:135
 msgid "Critical Hit"
 msgstr "Kritischer Treffer"
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:136
 msgid "Misses"
 msgstr "Verfehlt"
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:138
 msgid "HP Bar"
 msgstr "HP Leiste"
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:139
 msgid "3/4 HP Bar"
 msgstr "3/4 HP Leiste"
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:140
 msgid "1/2 HP Bar"
 msgstr "1/2 HP Leiste"
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:141
 msgid "1/4 HP Bar"
 msgstr "1/4 HP Leiste"
 
-#: src/gui/partywindow.cpp:70
+#: src/gui/palette.cpp:152 src/gui/palette.cpp:285
+#, fuzzy
+msgid "Gradient"
+msgstr "Handeln"
+
+#: src/gui/palette.cpp:155 src/gui/palette.cpp:286
+msgid "Delay"
+msgstr "Verzögerung: "
+
+#: src/gui/palette.cpp:160 src/gui/palette.cpp:276
+#, c-format
+msgid "0x%06x"
+msgstr ""
+
+#: src/gui/partywindow.cpp:78
 #, c-format
 msgid "Party (%s)"
 msgstr "Party (%s)"
 
-#: src/gui/partywindow.cpp:174
+#: src/gui/partywindow.cpp:178
 msgid "Received party request, but one already exists."
 msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/gui/partywindow.cpp:182
+#: src/gui/partywindow.cpp:186
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/partywindow.cpp:189
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/gui/partywindow.cpp:191
+#: src/gui/partywindow.cpp:195
 msgid "Accept Party Invite"
 msgstr "Nehme Partyeinladung an"
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/partywindow.cpp:208
 #, c-format
 msgid "Accepted invite from %s."
 msgstr "Partyeinladung von %s angenommen."
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/partywindow.cpp:215
 #, c-format
 msgid "Rejected invite from %s."
 msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr "@@name|Füge Namen zu Chat hinzu@@"
+#: src/gui/popupmenu.cpp:58
+msgid "PopupMenu"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:92
 #, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Mit %s handeln@@"
+msgid "Whisper %s"
+msgstr "flüstere %s"
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:100
 #, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|%s angreifen@@"
+msgid "Befriend %s"
+msgstr "Sei Freund von %s"
 
-#: src/gui/popupmenu.cpp:96
-#, c-format
-msgid "@@friend|Befriend %s@@"
-msgstr "@@friend|Füge %s@@ als Freund hinzu"
+#: src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Unbeachtet"
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:108
 #, c-format
-msgid "@@disregard|Disregard %s@@"
-msgstr "@@disregard|Vernachlässige %s@@"
+msgid "Ignore %s"
+msgstr "Ignoriere %s"
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
-msgid "@@ignore|Ignore %s@@"
-msgstr "@@ignore|Ignoriere %s@@"
+msgid "Unignore %s"
+msgstr "Ignoriere %s nicht mehr"
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:117
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
-msgstr "@@unignore|Stoppe Ignorieren von %s@@"
+msgid "Completely ignore %s"
+msgstr "Ignoriere %s komplett"
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:132
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
-msgstr "@@ignore|Ignoriere %s komplett@@"
+msgid "Invite %s to join your guild"
+msgstr "Lade %s in deine Gilde ein"
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:136
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
-msgstr "@@guild|Lade %s in deine Gilde ein@@"
+msgid "Invite %s to join your party"
+msgstr "Lade %s in deine Party ein"
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:143
+msgid "Kick player"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
-msgstr "@@party|%s in deine Gruppe einladen@@"
+msgid "Talk to %s"
+msgstr "Rede mit %s"
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Spieler rauswerfen@@"
+#: src/gui/popupmenu.cpp:165
+msgid "Kick monster"
+msgstr "Monster töten"
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:173
+msgid "Add name to chat"
+msgstr "Füge Namen zu Chat hinzu"
+
+#: src/gui/popupmenu.cpp:190
 #, c-format
-msgid "@@talk|Talk To %s@@"
-msgstr "@@talk|Rede mit %s@@"
+msgid "Pick up %s"
+msgstr "Hebe %s auf"
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
-msgstr "@@admin-kick|Monster töten"
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:398
+msgid "Add to chat"
+msgstr "Zu Chat hinzufügen"
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancel|Abbrechen@@"
+#: src/gui/popupmenu.cpp:206
+msgid "talk"
+msgstr "Sprechen"
 
-#: src/gui/popupmenu.cpp:165
-#, c-format
-msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Aufheben %s@@"
+#: src/gui/popupmenu.cpp:215 src/gui/trade.cpp:240 src/gui/trade.cpp:304
+msgid "trade"
+msgstr "Handeln"
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Zu Chat hinzufügen@@"
+#: src/gui/popupmenu.cpp:223 src/resources/itemdb.cpp:52
+#: src/resources/monsterdb.cpp:129 src/resources/monsterdb.cpp:135
+msgid "attack"
+msgstr "Angriff"
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr "@@use|Ablegen@@"
+#: src/gui/popupmenu.cpp:229
+msgid "/w \""
+msgstr ""
 
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Ausrüsten@@"
+#: src/gui/popupmenu.cpp:229
+msgid "\" "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:245
+#, fuzzy
+msgid "disregard"
+msgstr "Unbeachtet"
+
+#: src/gui/popupmenu.cpp:252
+msgid "friend"
+msgstr "Freund"
+
+#: src/gui/popupmenu.cpp:259
+msgid "guild"
+msgstr "Gilde"
 
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Nutzen@@"
+#: src/gui/popupmenu.cpp:272
+msgid "pickup"
+msgstr "Aufheben"
 
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Fallen lassen@@"
+#: src/gui/popupmenu.cpp:278
+msgid "look"
+msgstr "Schauen "
 
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Aufteilen@@"
+#: src/gui/popupmenu.cpp:298
+msgid "chat"
+msgstr "Chat"
 
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
-msgstr "@@store|Einlagern@@"
+#: src/gui/popupmenu.cpp:315 src/gui/storagewindow.cpp:67
+#: src/gui/storagewindow.cpp:127
+msgid "store"
+msgstr "Einlagern"
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
-msgstr "@@retrieve|Wiederholen@@"
+#: src/gui/popupmenu.cpp:321 src/gui/storagewindow.cpp:68
+#: src/gui/storagewindow.cpp:138
+msgid "retrieve"
+msgstr "Abholen"
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/popupmenu.cpp:332 src/gui/serverdialog.cpp:383
+#: src/gui/skilldialog.cpp:189 src/gui/skilldialog.cpp:204
+#: src/gui/specialswindow.cpp:173 src/gui/specialswindow.cpp:190
+#: src/playerrelations.cpp:38 src/resources/itemdb.cpp:147
+#: src/resources/monsterdb.cpp:67
+msgid "name"
+msgstr "Name"
+
+#: src/gui/popupmenu.cpp:338
+msgid "admin-kick"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:349
+#, c-format
+msgid "PopupMenu: Warning, unknown action '%s'"
+msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
+
+#: src/gui/popupmenu.cpp:389 src/gui/storagewindow.cpp:67
+msgid "Store"
+msgstr "Einlagern"
+
+#: src/gui/popupmenu.cpp:396 src/gui/storagewindow.cpp:68
+msgid "Retrieve"
+msgstr "Abholen"
+
+#: src/gui/quitdialog.cpp:42 src/gui/quitdialog.cpp:43
+#: src/gui/quitdialog.cpp:44 src/gui/quitdialog.cpp:45
+msgid "quitdialog"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Server wechseln"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Spielfigur wechseln"
 
-#: src/gui/recorder.cpp:87
+#: src/gui/recorder.cpp:40
+msgid "Recorder"
+msgstr "Aufzeichnung"
+
+#: src/gui/recorder.cpp:45
+msgid "activate"
+msgstr ""
+
+#: src/gui/recorder.cpp:88
 msgid "Finishing recording."
 msgstr "Aufzeichnung abgeschlossen."
 
-#: src/gui/recorder.cpp:91
+#: src/gui/recorder.cpp:92
 msgid "Not currently recording."
 msgstr "Es läuft keine Aufzeichnung."
 
-#: src/gui/recorder.cpp:96
+#: src/gui/recorder.cpp:97
 msgid "Already recording."
 msgstr "Es läuft bereits eine Aufzeichnung."
 
-#: src/gui/recorder.cpp:104
+#: src/gui/recorder.cpp:105
 msgid "Starting to record..."
 msgstr "Starte Aufzeichnung..."
 
@@ -1164,78 +2136,246 @@ msgstr "Aufzeichnung läuft..."
 msgid "Stop recording"
 msgstr "Stoppe Aufzeichnung"
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:90 src/gui/register.cpp:91
+msgid "sex"
+msgstr "Geschlecht"
+
+#: src/gui/register.cpp:100
 msgid "Email:"
-msgstr "E-Mail:"
+msgstr "eMail:"
 
-#: src/gui/register.cpp:170
+#: 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."
 msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:118
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Das Passwort muss aus mindestens %d bestehen."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:125
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/sdlinput.cpp:79 src/gui/sdlinput.cpp:99
+msgid "The queue is empty."
+msgstr "Die Warteschlange ist leer."
+
+#: src/gui/sell.cpp:74 src/gui/sell.cpp:182
+msgid "sell"
+msgstr "Verkaufen"
+
+#: src/gui/serverdialog.cpp:76 src/gui/updatewindow.cpp:301
+#: src/gui/worldselectdialog.cpp:64
+msgid " ("
+msgstr ""
+
+#: src/gui/serverdialog.cpp:80 src/gui/worldselectdialog.cpp:64
+msgid ")"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:87
+msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:94 src/gui/widgets/chattab.cpp:135
+msgid "Server:"
+msgstr "Server:"
+
+#: src/gui/serverdialog.cpp:95
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:106 src/gui/serverdialog.cpp:228
+msgid "MostUsedServerName"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:109 src/gui/serverdialog.cpp:230
+msgid "MostUsedServerPort"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:128
+msgid "Connect"
+msgstr "Verbinde..."
+
+#: src/gui/serverdialog.cpp:128 src/gui/serverdialog.cpp:131
+#: src/gui/serverdialog.cpp:132 src/gui/serverdialog.cpp:191
+msgid "connect"
+msgstr "Verbinde..."
+
+#: src/gui/serverdialog.cpp:129
+msgid "Add Entry"
+msgstr "Neuer Eintrag"
+
+#: src/gui/serverdialog.cpp:129 src/gui/serverdialog.cpp:249
+msgid "addEntry"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:197
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Server auswählen"
+#: src/gui/serverdialog.cpp:215
+msgid "MostUsedServerName0"
+msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Einstellungen"
+#: src/gui/serverdialog.cpp:216
+msgid "MostUsedServerPort0"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Anwenden"
+#: src/gui/serverdialog.cpp:296
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Fenster zurücksetzen"
+#: src/gui/serverdialog.cpp:302
+msgid "Waiting for server..."
+msgstr "Warte auf den Server"
+
+#: src/gui/serverdialog.cpp:306
+msgid "Preparing download"
+msgstr "Download wird vorbereitet"
+
+#: src/gui/serverdialog.cpp:343
+msgid "onlineServerList"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/serverdialog.cpp:343 src/gui/serverdialog.cpp:345
+msgid "void"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:362 src/main.cpp:565
+msgid "version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:366
+msgid "Online server list has wrong version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:376 src/gui/updatewindow.cpp:72
+#: src/resources/itemdb.cpp:143
+msgid "type"
+msgstr "Typ: "
+
+#: src/gui/serverdialog.cpp:376
+#, fuzzy
+msgid "unknown"
+msgstr "Unbekannter Gegenstand"
+
+#: src/gui/serverdialog.cpp:387
+msgid "connection"
+msgstr "Verbindung"
+
+#: src/gui/serverdialog.cpp:389
+msgid "manaserv"
+msgstr "manaserver"
+
+#: src/gui/serverdialog.cpp:393
+#, fuzzy
+msgid "eathena"
+msgstr "Erstellen"
+
+#: src/gui/serverdialog.cpp:401
+msgid "hostname"
+msgstr "Servername"
+
+#: src/gui/serverdialog.cpp:402 src/main.cpp:312 src/main.cpp:560
+msgid "port"
+msgstr "Port:"
+
+#: src/gui/serverdialog.cpp:448
+#, c-format
+msgid "Error retreiving server list: %s\n"
+msgstr "Fehler beim empfangen der Serverliste: %s\n"
+
+#: src/gui/setup_audio.cpp:38 src/gui/setup_audio.cpp:86
+#: src/gui/setup_audio.cpp:130 src/gui/setup_audio.cpp:142 src/main.cpp:324
+#: src/main.cpp:467
+msgid "musicVolume"
+msgstr "Lautstärke der Musik"
+
+#: src/gui/setup_audio.cpp:39 src/gui/setup_audio.cpp:85
+#: src/gui/setup_audio.cpp:129 src/gui/setup_audio.cpp:137 src/main.cpp:323
+#: src/main.cpp:465
+msgid "sfxVolume"
+msgstr "Lautstärke der Klangeffekte"
+
+#: src/gui/setup_audio.cpp:40 src/gui/setup_audio.cpp:88
+#: src/gui/setup_audio.cpp:127 src/main.cpp:320 src/main.cpp:462
+#: src/resources/itemdb.cpp:196 src/resources/monsterdb.cpp:99
+msgid "sound"
+msgstr "Ton"
+
+#: src/gui/setup_audio.cpp:41 src/gui/setup_audio.cpp:92
+#: src/gui/setup_audio.cpp:96 src/gui/setup_audio.cpp:128
+#: src/gui/updatewindow.cpp:459
+msgid "download-music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Ton"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Lade Musik herunter"
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Audio"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Lautstärke der Musik"
 
+#: src/gui/setup_audio.cpp:53 src/gui/setup_audio.cpp:135
+msgid "sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Kein Text"
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+"Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen "
+"werden soll"
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Soundengine"
+
+#: src/gui/setup_audio.cpp:107 src/main.cpp:474
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr "So wird die Farbe aussehen"
@@ -1245,44 +2385,77 @@ msgid "Colors"
 msgstr "Farben"
 
 #: src/gui/setup_colors.cpp:71
-msgid "Type: "
+msgid "Type:"
 msgstr "Typ: "
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: 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
 msgid "Static"
 msgstr "Statisch"
 
 #: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr "Pulsierend"
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr "Regenbogen"
 
 #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+msgid "Delay:"
 msgstr "Verzögerung: "
 
+#: src/gui/setup_colors.cpp:104 src/gui/setup_colors.cpp:199
+msgid "slider_graddelay"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:108
-msgid "Red: "
+msgid "Red:"
 msgstr "Rot: "
 
+#: src/gui/setup_colors.cpp:119 src/gui/setup_colors.cpp:206
+msgid "slider_red"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:123
-msgid "Green: "
+msgid "Green:"
 msgstr "Grün: "
 
+#: src/gui/setup_colors.cpp:134 src/gui/setup_colors.cpp:213
+msgid "slider_green"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+msgid "Blue:"
 msgstr "Blau: "
 
+#: src/gui/setup_colors.cpp:149 src/gui/setup_colors.cpp:220
+msgid "slider_blue"
+msgstr ""
+
+#: src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62 src/gui/windowmenu.cpp:138
+#: src/main.cpp:879 src/main.cpp:1287
+msgid "Setup"
+msgstr "Einstellungen"
+
+#: src/gui/setup.cpp:51 src/gui/setup.cpp:101
+msgid "Apply"
+msgstr "Anwenden"
+
+#: src/gui/setup.cpp:51 src/gui/setup.cpp:62 src/gui/setup.cpp:111
+msgid "Reset Windows"
+msgstr "Fenster zurücksetzen"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
@@ -1291,6 +2464,10 @@ msgstr "Knopf drücken um die Kalibrierung zu starten"
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
+#: src/gui/setup_joystick.cpp:38
+msgid "calibrate"
+msgstr "Kalibrieren"
+
 #: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
@@ -1299,6 +2476,10 @@ msgstr "Joystick aktivieren"
 msgid "Joystick"
 msgstr "Joystick"
 
+#: src/gui/setup_joystick.cpp:43 src/gui/setup_joystick.cpp:101
+msgid "joystickEnabled"
+msgstr "Joystick"
+
 #: src/gui/setup_joystick.cpp:83
 msgid "Stop"
 msgstr "Stopp"
@@ -1315,18 +2496,35 @@ msgstr "Tastatur"
 msgid "Assign"
 msgstr "Zuordnen"
 
+#: src/gui/setup_keyboard.cpp:86 src/gui/setup_keyboard.cpp:144
+msgid "assign"
+msgstr "Zuordnen"
+
 #: src/gui/setup_keyboard.cpp:90
 msgid "Default"
 msgstr "Standard"
 
+#: src/gui/setup_keyboard.cpp:90 src/gui/setup_keyboard.cpp:153
+msgid "makeDefault"
+msgstr "stelle Standardeinstellungen her"
+
 #: src/gui/setup_keyboard.cpp:119
-msgid "Key Conflict(s) Detected."
+msgid "Key Conflict(s) Detected"
 msgstr "Tastenkonflikte entdeckt."
 
 #: src/gui/setup_keyboard.cpp:120
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
+#: src/gui/setup_keyboard.cpp:151
+msgid ": ?"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:165 src/gui/widgets/chattab.cpp:127
+#: src/gui/widgets/chattab.cpp:131 src/gui/widgets/chattab.cpp:159
+msgid ": "
+msgstr ""
+
 #: src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr "Name"
@@ -1355,6 +2553,18 @@ msgstr "Ignoriert"
 msgid "???"
 msgstr "???"
 
+#: src/gui/setup_players.cpp:214
+msgid "table"
+msgstr ""
+
+#: src/gui/setup_players.cpp:215
+msgid "strategy"
+msgstr ""
+
+#: src/gui/setup_players.cpp:216
+msgid "whisper tab"
+msgstr "geflüsterte Nachricht"
+
 #: src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr "Handeln erlauben"
@@ -1375,6 +2585,20 @@ msgstr "Spieler"
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
+#: src/gui/setup_video.cpp:94
+#, fuzzy
+msgid "No modes available"
+msgstr "Keine Server verfügbar"
+
+#: src/gui/setup_video.cpp:96
+msgid "All resolutions available"
+msgstr ""
+
+#: src/gui/setup_video.cpp:103 src/gui/setup_video.cpp:452
+#: src/gui/setup_video.cpp:453
+msgid "x"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Tiny"
 msgstr "Winzig"
@@ -1403,354 +2627,632 @@ msgstr "Blasen, keine Namen"
 msgid "Bubbles with names"
 msgstr "Blasen mit Namen"
 
-#: src/gui/setup_video.cpp:153
+#: 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
 msgid "off"
 msgstr "Aus"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:157 src/gui/setup_video.cpp:170
 msgid "low"
 msgstr "Niedrig"
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:172
 msgid "high"
 msgstr "Hoch"
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:166 src/gui/setup_video.cpp:217
+#: src/gui/setup_video.cpp:534
+msgid "particleEmitterSkip"
+msgstr ""
+
+#: src/gui/setup_video.cpp:171 src/resources/monsterdb.cpp:70
+#: src/resources/monsterdb.cpp:75
 msgid "medium"
 msgstr "Mittel"
 
-#: src/gui/setup_video.cpp:167
-msgid "max"
-msgstr "max"
+#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:344
+#: src/gui/setup_video.cpp:387 src/gui/setup_video.cpp:406
+#: src/gui/setup_video.cpp:433 src/main.cpp:319 src/main.cpp:438
+#, fuzzy
+msgid "screen"
+msgstr "Vollbild"
+
+#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:355
+#: src/gui/setup_video.cpp:393 src/gui/setup_video.cpp:415
+#: src/gui/setup_video.cpp:442 src/main.cpp:315 src/main.cpp:317
+#: src/main.cpp:423
+msgid "opengl"
+msgstr ""
+
+#: src/gui/setup_video.cpp:181 src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:407 src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:475 src/gui/setup_video.cpp:477 src/main.cpp:329
+msgid "customcursor"
+msgstr "Benutzerdefinierter Zeiger"
+
+#: src/gui/setup_video.cpp:182 src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:408 src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:479 src/gui/setup_video.cpp:481
+msgid "visiblenames"
+msgstr "Sichtbare Namen"
+
+#: src/gui/setup_video.cpp:183 src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:409 src/gui/setup_video.cpp:436
+#: src/gui/setup_video.cpp:483 src/gui/setup_video.cpp:485
+msgid "particleeffects"
+msgstr "Partikeleffekte"
+
+#: src/gui/setup_video.cpp:184 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:410 src/gui/setup_video.cpp:438
+#: src/gui/setup_video.cpp:511 src/gui/setup_video.cpp:517
+#: src/localplayer.cpp:126 src/localplayer.cpp:127 src/localplayer.cpp:135
+#: src/localplayer.cpp:1149 src/localplayer.cpp:1151
+msgid "showownname"
+msgstr "Zeige eigenen Namen"
+
+#: src/gui/setup_video.cpp:185 src/gui/setup_video.cpp:416
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:497
+#: src/localplayer.cpp:972 src/localplayer.cpp:979
+msgid "showpickupchat"
+msgstr "Benachrichtigung beim Aufheben"
+
+#: src/gui/setup_video.cpp:186 src/gui/setup_video.cpp:417
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:501
+#: src/localplayer.cpp:989
+#, fuzzy
+msgid "showpickupparticle"
+msgstr "als Partikeleffekt"
+
+#: src/gui/setup_video.cpp:187 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:413 src/gui/setup_video.cpp:441
+#: src/gui/setup_video.cpp:471 src/gui/setup_video.cpp:473 src/main.cpp:321
+msgid "guialpha"
+msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:190 src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:412 src/gui/setup_video.cpp:437
+#: src/gui/setup_video.cpp:504 src/gui/setup_video.cpp:509
+msgid "speech"
+msgstr ""
+
+#: src/gui/setup_video.cpp:193
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:194
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:195
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:197
 msgid "Visible names"
 msgstr "Sichtbare Namen"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:199
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:201
+#, fuzzy
+msgid "Show own name"
 msgstr "Eigener Name"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:202
 msgid "Show pickup notification"
 msgstr "Benachrichtigung beim Aufheben"
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:204
 msgid "in chat"
 msgstr "im Chatfenster"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:206
 msgid "as particle"
 msgstr "als Partikeleffekt"
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:211
+#, fuzzy
+msgid "FPS limit:"
 msgstr "FPS-Limit:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:220 src/gui/setup_video.cpp:403
+#, fuzzy
+msgid "fontSize"
+msgstr "Schriftgröße"
+
+#: src/gui/setup_video.cpp:222
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
 msgid "Overhead text"
 msgstr "Chat über Spielern"
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:228
 msgid "Gui opacity"
 msgstr "GUI Transparenz"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:229
 msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:230
+#, fuzzy
+msgid "Particle detail"
 msgstr "Partikeldetail"
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:231
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr "Konnte Auflösung nicht ändern in "
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:449
+#, fuzzy
+msgid "videomode"
+msgstr " Auflösung: "
 
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr "Im Fenster"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:495
+#, fuzzy
+msgid "pickupchat"
+msgstr "Aufheben"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
-msgstr "Vollbild"
+#: src/gui/setup_video.cpp:256 src/gui/setup_video.cpp:499
+#, fuzzy
+msgid "pickupparticle"
+msgstr "als Partikeleffekt"
+
+#: src/gui/setup_video.cpp:259 src/gui/setup_video.cpp:537
+msgid "fpslimitcheckbox"
+msgstr ""
+
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:519
+msgid "fpslimitslider"
+msgstr ""
+
+#: src/gui/setup_video.cpp:262 src/gui/setup_video.cpp:524
+msgid "overlaydetailslider"
+msgstr ""
+
+#: src/gui/setup_video.cpp:263
+msgid "overlaydetailfield"
+msgstr ""
+
+#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:530
+#, fuzzy
+msgid "particledetailslider"
+msgstr "Partikeldetail"
+
+#: src/gui/setup_video.cpp:265
+#, fuzzy
+msgid "particledetailfield"
+msgstr "Partikeldetail"
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:366
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
+
+#: src/gui/setup_video.cpp:372
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:383
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:384
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:396
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Ändere OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:397
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:459 src/gui/setup_video.cpp:464
+#, fuzzy
+msgid "Screen Resolution Changed"
 msgstr "Auflösung geändert"
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:465
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:462
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+"Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
+"anzupassen."
+
+#: src/gui/setup_video.cpp:468 src/main.cpp:435 src/main.cpp:884
+msgid "screenwidth"
+msgstr ""
+
+#: src/gui/setup_video.cpp:469 src/main.cpp:436 src/main.cpp:886
+#, fuzzy
+msgid "screenheight"
+msgstr "Bildschirmfoto"
+
+#: src/gui/setup_video.cpp:491
+#, fuzzy
+msgid "Particle Effect Settings Changed."
 msgstr "Partikeleffekteinstellungen geändert."
 
-#: src/gui/setup_video.cpp:468
+#: src/gui/setup_video.cpp:492
 msgid "Changes will take effect on map change."
 msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
-msgstr "Unbekannter Skill"
-
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:85 src/gui/skilldialog.cpp:87
+#: src/gui/windowmenu.cpp:58 src/gui/windowmenu.cpp:122
 msgid "Skills"
 msgstr "Fertigkeiten"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
-#, c-format
-msgid "Skill points: %d"
+#: src/gui/skilldialog.cpp:141
+#, fuzzy, c-format
+msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/skill.cpp:149
-msgid "Up"
-msgstr "Erhöhen"
+#: src/gui/skilldialog.cpp:173
+#, fuzzy
+msgid "skills"
+msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
-msgstr "Waffen"
+#: src/gui/skilldialog.cpp:175
+#, fuzzy, c-format
+msgid "Error loading skills file: %s"
+msgstr "Fehler beim Laden von %s"
+
+#: src/gui/skilldialog.cpp:186 src/gui/specialswindow.cpp:170
+#, fuzzy
+msgid "set"
+msgstr "Zurücksetzten"
+
+#: src/gui/skilldialog.cpp:189
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Fähigkeitspunkte: %d"
+
+#: src/gui/skilldialog.cpp:201
+#, fuzzy
+msgid "skill"
+msgstr "Fertigkeiten"
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
-msgstr "Handwerk"
+#: src/gui/skilldialog.cpp:203 src/gui/specialswindow.cpp:187
+#: src/resources/itemdb.cpp:131 src/resources/monsterdb.cpp:131
+#: src/resources/monsterdb.cpp:144
+msgid "id"
+msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/skilldialog.cpp:204
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Fertigkeiten"
+
+#: src/gui/skilldialog.cpp:205 src/gui/specialswindow.cpp:191
+msgid "icon"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:240 src/gui/specialswindow.cpp:212
+msgid "999"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:252 src/gui/specialswindow.cpp:222
+msgid "graphics/gui/unknown-item.png"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:315
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Stufe: %d"
+
+#: src/gui/skilldialog.cpp:320
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Stufe: %d"
+
+#: src/gui/skilldialog.cpp:326 src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:177 src/resources/itemdb.cpp:182
+msgid " / "
+msgstr ""
+
+#: src/gui/specialswindow.cpp:84 src/gui/specialswindow.cpp:86
+#: src/gui/windowmenu.cpp:59 src/gui/windowmenu.cpp:126
+msgid "Specials"
+msgstr "Special"
+
+#: src/gui/specialswindow.cpp:157
+msgid "specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:159
+#, fuzzy, c-format
+msgid "Error loading specials file: %s"
+msgstr "Fehler beim Laden von %s"
+
+#: src/gui/specialswindow.cpp:173
 #, c-format
-msgid "Job: %d"
-msgstr "Job: %d"
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:185
+msgid "special"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:190
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:87 src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:110
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Stufe: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr "Geld: %s"
 
-#: src/gui/status.cpp:60
+#: src/gui/statuswindow.cpp:102
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/status.cpp:63
+#: src/gui/statuswindow.cpp:107
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/status.cpp:66
+#: src/gui/statuswindow.cpp:112
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/status.cpp:69
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr "Job: %d"
+
+#: src/gui/statuswindow.cpp:133
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Fähigkeiten"
-
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Gesamt"
-
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Preis"
-
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Angriff:"
-
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "Verteidigung:"
-
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
-msgstr "M.Angriff:"
-
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
-msgstr "M.Verteidigung:"
-
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
-msgstr "% Genauigkeit"
+#: src/gui/statuswindow.cpp:161 src/gui/statuswindow.cpp:166 src/main.cpp:686
+msgid "C"
+msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
-msgstr "% Ausweichen:"
+#: src/gui/statuswindow.cpp:194
+#, fuzzy
+msgid "HP"
+msgstr "HP:"
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
-msgstr "% Reaktion:"
+#: src/gui/statuswindow.cpp:200
+#, fuzzy
+msgid "MP"
+msgstr "MP:"
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Stärke"
+#: src/gui/statuswindow.cpp:206
+#, fuzzy
+msgid "Exp"
+msgstr "Exp:"
 
-#: src/gui/status.cpp:199
-msgid "Agility"
-msgstr "Beweglichkeit"
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Geld: %d"
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
-msgstr "Gesundheit"
+#: src/gui/statuswindow.cpp:225
+#, fuzzy
+msgid "Job"
+msgstr "Job:"
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "Intelligenz"
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Spielfigurattribute OK"
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Ausdauer"
+#: src/gui/statuswindow.cpp:235
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Glück"
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Stufe: %d"
 
-#: src/gui/status.cpp:221
+#: src/gui/statuswindow.cpp:416
 #, c-format
-msgid "Remaining Status Points: %d"
-msgstr "Verbleibende Statuspunkte: %d"
+msgid "%2.2f"
+msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
-msgstr "Max Level"
+#: src/gui/statuswindow.cpp:416
+msgid "%"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:54
+#: src/gui/statuswindow.cpp:456
+#, fuzzy, c-format
+msgid " (%+d)"
+msgstr "HP %+d"
+
+#: src/gui/storagewindow.cpp:55 src/gui/storagewindow.cpp:59
 msgid "Storage"
 msgstr "Lager"
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
-msgstr "Einlagern"
-
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
-msgstr "Abholen"
+#: src/gui/textdialog.cpp:37 src/gui/textdialog.cpp:77
+msgid "CANCEL"
+msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Handel vorschlagen"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Bestätigt. Warten..."
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Handel zustimmen"
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Zugestimmt. Warten..."
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Handel: Du"
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:75 src/gui/trade.cpp:76
 msgid "Trade"
 msgstr "Handeln"
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:78
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
+#: src/gui/trade.cpp:78 src/gui/trade.cpp:257
+#, fuzzy
+msgid "add"
+msgstr "Hinzufügen"
+
+#: src/gui/trade.cpp:100 src/gui/trade.cpp:136
+#, fuzzy, c-format
+msgid "You get %s"
 msgstr "Du erhältst %s."
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:101
 msgid "You give:"
 msgstr "Du gibst:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:105
 msgid "Change"
 msgstr "Ändern"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:105 src/gui/trade.cpp:310
+#, fuzzy
+msgid "money"
+msgstr "Gefühle"
+
+#: src/gui/trade.cpp:276
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
 "Gegenstände hinzufügen."
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:319
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Name : %s"
+
+#: src/gui/unregisterdialog.cpp:105
+#, c-format
+msgid "UnregisterDialog::unregistered, Username is %s"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:57
+msgid "updates"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:59 src/gui/updatewindow.cpp:114
+#, fuzzy, c-format
+msgid "Error loading update file: %s"
+msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
+
+#: src/gui/updatewindow.cpp:66
+msgid "update"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:70
+#, fuzzy
+msgid "file"
+msgstr "Grinsen"
+
+#: src/gui/updatewindow.cpp:71
+msgid "hash"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:72 src/gui/updatewindow.cpp:105 src/main.cpp:388
+#: src/main.cpp:402 src/main.cpp:553
+msgid "data"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:73 src/resources/itemdb.cpp:149
+#, fuzzy
+msgid "description"
+msgstr "Beschreibung: %s"
+
+#: src/gui/updatewindow.cpp:74
+msgid "required"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
-#: src/gui/updatewindow.cpp:113
+#: src/gui/updatewindow.cpp:128
+msgid "news.txt"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr "Los!"
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr "curl fehler "
+#: src/gui/updatewindow.cpp:145 src/gui/updatewindow.cpp:221
+#, fuzzy
+msgid "play"
+msgstr "Los!"
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
-msgstr " host: "
+#: src/gui/updatewindow.cpp:254
+#, fuzzy
+msgid "Couldn't load news"
+msgstr "Karte konnte nicht geladen werden"
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:399
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
-#: src/gui/updatewindow.cpp:450
+#: src/gui/updatewindow.cpp:401
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#: src/gui/updatewindow.cpp:403
+#, fuzzy
+msgid "##1  you try again later."
 msgstr "##1 es später erneut zu versuchen."
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:430
+#, c-format
+msgid "Warning this server does not have a %s file falling back to %s"
+msgstr "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
+
+#: src/gui/updatewindow.cpp:482
+#, c-format
+msgid "%s already here"
+msgstr "%s ist bereits hier"
+
+#: src/gui/updatewindow.cpp:495
 msgid "Completed"
 msgstr "Fertig"
 
@@ -1774,6 +3276,11 @@ msgstr "/op > Ernenne einen Spieler zum Kanalwärter"
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > Werfe einen Spieler aus dem Kanal"
 
+#: src/gui/widgets/channeltab.cpp:61 src/gui/widgets/channeltab.cpp:97
+#, fuzzy
+msgid "users"
+msgstr "benutze"
+
 #: src/gui/widgets/channeltab.cpp:63
 msgid "Command: /users"
 msgstr "Befehl: /users"
@@ -1782,6 +3289,12 @@ msgstr "Befehl: /users"
 msgid "This command shows the users in this channel."
 msgstr "Dieser Befehl zeit eine Liste der Spieler im aktuellen Kanal."
 
+#: src/gui/widgets/channeltab.cpp:66 src/gui/widgets/channeltab.cpp:101
+#: src/gui/widgets/channeltab.cpp:105
+#, fuzzy
+msgid "topic"
+msgstr "Stopp"
+
 #: src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
 msgstr "Befehl: /topic <Thema>"
@@ -1802,154 +3315,348 @@ msgstr "Mit diesem Befehl verlässt Du den aktuellen Kanal"
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "Wenn Du die letzte Person im Kanal bist, wird dieser gelöscht."
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:78 src/gui/widgets/channeltab.cpp:113
+#, fuzzy
+msgid "op"
+msgstr "Geschäft"
+
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr "Befehl: /op <Name>"
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
 "Moderator-Rechte verleihen."
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:87 src/gui/widgets/channeltab.cpp:121
+#: src/net/ea/gui/partytab.cpp:125
+#, fuzzy
+msgid "kick"
+msgstr "Aufheben"
+
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr "Befehl: /kick <Name>"
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr "Diese Befehl wirft Spieler <Name> aus dem Kanal"
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr "Gib einen Spieler an, der Moderator werden soll!"
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
 
+#: src/gui/widgets/chattab.cpp:51 src/main.cpp:330
+msgid "ChatLogLength"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:92
+msgid "Welcome"
+msgstr "Wilkommen"
+
+#: src/gui/widgets/chattab.cpp:108 src/gui/widgets/chattab.cpp:132
+msgid "##C"
+msgstr ""
+
 #: src/gui/widgets/chattab.cpp:114
 msgid "Global announcement:"
 msgstr "Globale Ansage:"
 
+#: src/gui/widgets/chattab.cpp:116
+msgid "##G"
+msgstr ""
+
 #: src/gui/widgets/chattab.cpp:120
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale Ansage von %s:"
 
+#: src/gui/widgets/chattab.cpp:123
+msgid "##1"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:128
+msgid "##Y"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:138 src/gui/widgets/chattab.cpp:162
+msgid "##S"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:143
+msgid "##2"
+msgstr ""
+
 #: src/gui/widgets/chattab.cpp:146
-#, c-format
-msgid "%s whispers: "
+#, fuzzy, c-format
+msgid "%s whispers: %s"
 msgstr "%s flüstert: "
 
-#: src/gui/widgets/whispertab.cpp:49
+#: 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
 msgid "Cannot send empty chat!"
 msgstr "Kann keine leere Nachricht senden!"
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:69
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
 msgid "/close > Close the whisper tab"
 msgstr "/close > Schließe einen privaten Tab"
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:81
 msgid "Command: /close"
 msgstr "Befehl: /close"
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:82
 msgid "This command closes the current whisper tab."
 msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Status"
+#: src/gui/widgets/whispertab.cpp:86
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Befehl: /item"
+
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+
+#: src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+"<Dateiname>."
+
+#: src/gui/windowmenu.cpp:54 src/gui/windowmenu.cpp:89
+msgid ":-)"
+msgstr ":-)"
 
-#: src/gui/windowmenu.cpp:65
+#: src/gui/windowmenu.cpp:60 src/gui/windowmenu.cpp:130
 msgid "Guilds"
 msgstr "Gilden"
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
-msgstr "Freunde"
-
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:61 src/gui/windowmenu.cpp:134
 msgid "Shortcut"
 msgstr "Tastenkürzel"
 
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "OK auswählen"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Ändern"
+
+#: src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Wähle deinen Server"
+
+#: src/gui/worldselectdialog.cpp:77 src/gui/worldselectdialog.cpp:111
+#, fuzzy
+msgid "world"
+msgstr "Schwertpolarm"
+
+#: src/keyboardconfig.cpp:41
+#, fuzzy
+msgid "keyMoveUp"
+msgstr "Laufe Hoch"
+
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
 msgstr "Laufe Hoch"
 
 #: src/keyboardconfig.cpp:42
+#, fuzzy
+msgid "keyMoveDown"
+msgstr "Laufe Runter"
+
+#: src/keyboardconfig.cpp:42
 msgid "Move Down"
 msgstr "Laufe Runter"
 
 #: src/keyboardconfig.cpp:43
+#, fuzzy
+msgid "keyMoveLeft"
+msgstr "Laufe nach Links"
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Left"
 msgstr "Laufe nach Links"
 
 #: src/keyboardconfig.cpp:44
+#, fuzzy
+msgid "keyMoveRight"
+msgstr "Laufe nach Rechts"
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Right"
 msgstr "Laufe nach Rechts"
 
 #: src/keyboardconfig.cpp:45
+#, fuzzy
+msgid "keyAttack"
+msgstr "Angriff"
+
+#: src/keyboardconfig.cpp:45 src/net/ea/generalhandler.cpp:216
 msgid "Attack"
 msgstr "Angriff"
 
 #: src/keyboardconfig.cpp:46
+#, fuzzy
+msgid "keyTargetAttack"
+msgstr "Zielen & Angreifen"
+
+#: src/keyboardconfig.cpp:46
 msgid "Target & Attack"
 msgstr "Zielen & Angreifen"
 
 #: src/keyboardconfig.cpp:47
+#, fuzzy
+msgid "keySmilie"
+msgstr "Grinsen"
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr "Grinsen"
 
 #: src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "keyTalk"
+msgstr "Sprechen"
+
+#: src/keyboardconfig.cpp:48
 msgid "Talk"
 msgstr "Sprechen"
 
 #: src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "keyTarget"
+msgstr "NPC anvisieren"
+
+#: src/keyboardconfig.cpp:49
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
 
 #: src/keyboardconfig.cpp:50
+#, fuzzy
+msgid "keyTargetClosest"
+msgstr "Nächstes Ziel anvisieren"
+
+#: src/keyboardconfig.cpp:50
 msgid "Target Closest"
 msgstr "Nächstes Ziel anvisieren"
 
 #: src/keyboardconfig.cpp:51
+#, fuzzy
+msgid "keyTargetNPC"
+msgstr "NPC anvisieren"
+
+#: src/keyboardconfig.cpp:51
 msgid "Target NPC"
 msgstr "NPC anvisieren"
 
 #: src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "keyTargetPlayer"
+msgstr "Spieler anvisieren"
+
+#: src/keyboardconfig.cpp:52
 msgid "Target Player"
 msgstr "Spieler anvisieren"
 
 #: src/keyboardconfig.cpp:53
+#, fuzzy
+msgid "keyPickup"
+msgstr "Aufheben"
+
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr "Aufheben"
 
 #: src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "keyHideWindows"
+msgstr "Fenster ausblenden"
+
+#: src/keyboardconfig.cpp:54
 msgid "Hide Windows"
 msgstr "Fenster ausblenden"
 
 #: src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "keyBeingSit"
+msgstr "Aktionen"
+
+#: src/keyboardconfig.cpp:55
 msgid "Sit"
 msgstr "Sitzen"
 
 #: src/keyboardconfig.cpp:56
+#, fuzzy
+msgid "keyScreenshot"
+msgstr "Bildschirmfoto"
+
+#: src/keyboardconfig.cpp:56
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
 #: src/keyboardconfig.cpp:57
+#, fuzzy
+msgid "keyTrade"
+msgstr "Handeln"
+
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
 #: src/keyboardconfig.cpp:58
+msgid "keyPathfind"
+msgstr ""
+
+#: src/keyboardconfig.cpp:58
 msgid "Find Path to Mouse"
 msgstr "Finde Weg zum Mauszeiger"
 
+#: src/keyboardconfig.cpp:59
+#, fuzzy
+msgid "keyShortcut1"
+msgstr "Tastenkürzel"
+
 #: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
 #: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
 #: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
@@ -1960,253 +3667,870 @@ msgstr "Finde Weg zum Mauszeiger"
 msgid "Item Shortcut %d"
 msgstr "Kurztaste %d"
 
+#: src/keyboardconfig.cpp:60
+#, fuzzy
+msgid "keyShortcut2"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:61
+#, fuzzy
+msgid "keyShortcut3"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:62
+#, fuzzy
+msgid "keyShortcut4"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:63
+#, fuzzy
+msgid "keyShortcut5"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:64
+#, fuzzy
+msgid "keyShortcut6"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:65
+#, fuzzy
+msgid "keyShortcut7"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:66
+#, fuzzy
+msgid "keyShortcut8"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:67
+#, fuzzy
+msgid "keyShortcut9"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:68
+#, fuzzy
+msgid "keyShortcut10"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:69
+#, fuzzy
+msgid "keyShortcut11"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:70
+#, fuzzy
+msgid "keyShortcut12"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:71
+msgid "keyWindowHelp"
+msgstr ""
+
 #: src/keyboardconfig.cpp:71
 msgid "Help Window"
 msgstr "Hilfefenster"
 
 #: src/keyboardconfig.cpp:72
+msgid "keyWindowStatus"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Status Window"
 msgstr "Statusfenster"
 
 #: src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "keyWindowInventory"
+msgstr "Inventar"
+
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
 #: src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "keyWindowEquipment"
+msgstr "Ausrüstung"
+
+#: src/keyboardconfig.cpp:74
 msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
 #: src/keyboardconfig.cpp:75
+#, fuzzy
+msgid "keyWindowSkill"
+msgstr "Unbekannte Fähigkeit"
+
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
 #: src/keyboardconfig.cpp:76
+msgid "keyWindowMinimap"
+msgstr ""
+
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
 #: src/keyboardconfig.cpp:77
+msgid "keyWindowChat"
+msgstr ""
+
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr "Chatfenster"
 
 #: src/keyboardconfig.cpp:78
+#, fuzzy
+msgid "keyWindowShortcut"
+msgstr "Tastenkürzel"
+
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
 #: src/keyboardconfig.cpp:79
+msgid "keyWindowSetup"
+msgstr ""
+
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr "Einstellungen"
 
 #: src/keyboardconfig.cpp:80
+msgid "keyWindowDebug"
+msgstr ""
+
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr "Debugfenster"
 
 #: src/keyboardconfig.cpp:81
+msgid "keyWindowParty"
+msgstr ""
+
+#: src/keyboardconfig.cpp:81
 msgid "Party Window"
 msgstr "Partyfenster"
 
 #: src/keyboardconfig.cpp:82
+msgid "keyWindowEmoteBar"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:83 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:83
+msgid "keyWindowOutfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Statusfenster"
+
+#: src/keyboardconfig.cpp:84
+#, fuzzy
+msgid "keyEmoteShortcut1"
+msgstr "Gefühlstaste %d"
+
+#: 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
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
+#: src/keyboardconfig.cpp:85
+#, fuzzy
+msgid "keyEmoteShortcut2"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:86
+#, fuzzy
+msgid "keyEmoteShortcut3"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:87
+#, fuzzy
+msgid "keyEmoteShortcut4"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:88
+#, fuzzy
+msgid "keyEmoteShortcut5"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:89
+#, fuzzy
+msgid "keyEmoteShortcut6"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:90
+#, fuzzy
+msgid "keyEmoteShortcut7"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:91
+#, fuzzy
+msgid "keyEmoteShortcut8"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:92
+#, fuzzy
+msgid "keyEmoteShortcut9"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:93
+#, fuzzy
+msgid "keyEmoteShortcut10"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:94
+#, fuzzy
+msgid "keyEmoteShortcut11"
+msgstr "Gefühlstaste %d"
+
 #: src/keyboardconfig.cpp:95
+#, fuzzy
+msgid "keyEmoteShortcut12"
+msgstr "Gefühlstaste %d"
+
+#: src/keyboardconfig.cpp:96
+#, fuzzy
+msgid "keyChat"
+msgstr "Chat"
+
+#: src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:97
+msgid "keyChatScrollUp"
+msgstr ""
+
+#: src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:97
-msgid "Scroll Chat Down"
+#: src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "keyChatScrollDown"
 msgstr "Im Chat runter scrollen"
 
 #: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Im Chat runter scrollen"
+
+#: src/keyboardconfig.cpp:99
+msgid "keyChatPrevTab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:100
+msgid "keyChatNextTab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:101
+msgid "keyOK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "OK auswählen"
 
 #: src/keyboardconfig.cpp:102
-msgid "Ignore input 1"
+#, fuzzy
+msgid "keyQuit"
+msgstr "Beenden"
+
+#: src/keyboardconfig.cpp:103
+#, fuzzy
+msgid "keyIgnoreInput1"
 msgstr "Ignoriere Eingabe 1"
 
 #: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignoriere Eingabe 1"
+
+#: src/keyboardconfig.cpp:104
+#, fuzzy
+msgid "keyIgnoreInput2"
+msgstr "Ignoriere Eingabe 2"
+
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr "Unbewaffnet"
+#: src/localplayer.cpp:695
+#, c-format
+msgid "SpecialUpdate Skill #%d -- (%d/%d) -> %d"
+msgstr ""
 
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr "Messer"
+#: src/localplayer.cpp:782
+msgid "sfx/fist-swish.ogg"
+msgstr ""
 
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr "Schwertpolarm"
+#: src/localplayer.cpp:888
+#, c-format
+msgid "%d %s xp"
+msgstr ""
 
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr "Waffenarm"
+#: src/localplayer.cpp:928
+msgid " xp"
+msgstr ""
 
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr "Stab"
+#: src/localplayer.cpp:974
+msgid "Unable to pick up item."
+msgstr "Kann das nicht aufheben."
 
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr "Peitsche"
+#: src/localplayer.cpp:983 src/localplayer.cpp:984
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgstr "Du hast %s [@@%d|%s@@] aufgehoben."
 
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr "Bogen"
+#: src/localplayer.cpp:1093
+msgid "graphics/gui/target-cursor-blue-s.png"
+msgstr ""
 
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr "Schießen"
+#: src/localplayer.cpp:1095
+msgid "graphics/gui/target-cursor-red-s.png"
+msgstr ""
 
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr "Irrgarten"
+#: src/localplayer.cpp:1097
+msgid "graphics/gui/target-cursor-blue-m.png"
+msgstr ""
 
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr "Axt"
+#: src/localplayer.cpp:1099
+msgid "graphics/gui/target-cursor-red-m.png"
+msgstr ""
 
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr "Geworfen"
+#: src/localplayer.cpp:1101
+msgid "graphics/gui/target-cursor-blue-l.png"
+msgstr ""
 
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr "Handwerk"
+#: src/localplayer.cpp:1103
+msgid "graphics/gui/target-cursor-red-l.png"
+msgstr ""
 
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr "Unbekannte Fähigkeit"
+#: src/main.cpp:202 src/main.cpp:328
+#, fuzzy
+msgid "updatehost"
+msgstr "Ungültiger Updateserver: "
+
+#: src/main.cpp:202
+msgid "http://updates.themanaworld.org/"
+msgstr ""
 
-#: src/main.cpp:263
-msgid "Invalid update host: "
+#: src/main.cpp:216 src/main.cpp:229
+msgid "updates/"
+msgstr ""
+
+#: src/main.cpp:221
+#, fuzzy, c-format
+msgid "Error: Invalid update host: %s"
+msgstr "Ungültiger Updateserver: "
+
+#: src/main.cpp:222
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: "
 
-#: src/main.cpp:296 src/main.cpp:302
+#: src/main.cpp:228
+msgid "Warning: no protocol was specified for the update host"
+msgstr ""
+
+#: src/main.cpp:253
+#, fuzzy, c-format
+msgid "Error: %s can't be made, but doesn't exist!"
+msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+
+#: src/main.cpp:255 src/main.cpp:261
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/main.cpp:259
+#, fuzzy, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
 
-#: src/main.cpp:492
-msgid "Couldn't set "
-msgstr "Konnte Einstellung nicht setzen: "
+#: src/main.cpp:282
+#, fuzzy
+msgid "Mana"
+msgstr "Mana"
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr " Auflösung: "
+#: src/main.cpp:285
+msgid "/."
+msgstr ""
+
+#: src/main.cpp:285
+#, fuzzy
+msgid "appShort"
+msgstr "Tastenkürzel"
 
-#: src/main.cpp:575
+#: src/main.cpp:285 src/main.cpp:520 src/main.cpp:694 src/main.cpp:696
+#: src/main.cpp:699 src/main.cpp:700
 msgid "mana"
 msgstr "mana"
 
-#: src/main.cpp:576
+#: src/main.cpp:297
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/main.cpp:308
+msgid "Initializing configuration..."
+msgstr ""
+
+#: src/main.cpp:309 src/main.cpp:787
+#, fuzzy
+msgid "defaultServer"
+msgstr "Server auswählen"
+
+#: src/main.cpp:310 src/main.cpp:788
+msgid "server.themanaworld.org"
+msgstr ""
+
+#: src/main.cpp:311 src/main.cpp:791
+#, fuzzy
+msgid "defaultPort"
+msgstr "Standard"
+
+#: src/main.cpp:313 src/main.cpp:439
+#, fuzzy
+msgid "hwaccel"
+msgstr "Abbrechen"
+
+#: src/main.cpp:322 src/main.cpp:683 src/main.cpp:783
+msgid "remember"
+msgstr ""
+
+#: src/main.cpp:326
+msgid "defaultUpdateHost"
+msgstr ""
+
+#: src/main.cpp:327
+msgid "http://updates.themanaworld.org"
+msgstr ""
+
+#: src/main.cpp:340
+msgid "r"
+msgstr ""
+
+#: src/main.cpp:345
+msgid "wt"
+msgstr ""
+
+#: src/main.cpp:348
+#, fuzzy, c-format
+msgid "Can't create %s. Using defaults."
+msgstr "Chat-Erstellung fehlgeschlagen!"
+
+#: src/main.cpp:361
+msgid "Initializing SDL..."
+msgstr ""
+
+#: src/main.cpp:363
+#, c-format
+msgid "Could not initialize SDL: %s"
+msgstr ""
+
+#: src/main.cpp:371
+#, fuzzy
+msgid "The Mana World"
+msgstr "The Mana World %s"
+
+#: src/main.cpp:377
+#, c-format
+msgid "%s couldn't be set as home directory! Exiting."
+msgstr ""
+
+#: src/main.cpp:396
+#, c-format
+msgid "Can't find Resources directory\n"
+msgstr "Kann das Ressourcen Verzeichnis nicht finden\n"
+
+#: src/main.cpp:399
+msgid "/data"
+msgstr ""
+
+#: src/main.cpp:408
+msgid "A"
+msgstr ""
+
+#: src/main.cpp:414
+msgid "appIcon"
+msgstr ""
+
+#: src/main.cpp:414
+msgid "data/icons/mana.png"
+msgstr ""
+
+#: src/main.cpp:444
+#, c-format
+msgid "Couldn't set %dx%dx%d video mode: %s"
+msgstr "Kann Videomodus %dx%dx%d nicht setzten: %s"
+
+#: src/main.cpp:521
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:522
+msgid "  -C --config-file    : Configuration file to use"
 msgstr "  -C --config-file : zu benutzende Konfigurationsdatei"
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
+#: src/main.cpp:523
+msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:524
+msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:526
+msgid "  -h --help           : Display this help"
 msgstr "  - --help : Zeigt diesen Hilfstext an"
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:527
+msgid "  -S --home-dir       : Directory to use as home directory"
 msgstr ""
 "  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:528
+msgid "  -i --screenshot-dir : Directory to store screenshots"
+msgstr ""
+"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
+
+#: src/main.cpp:529
+msgid "  -H --update-host    : Use this update host"
 msgstr "  -H --update-host : Benutze angegebenen Updateserver"
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:530
+msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:531
+msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:532
+msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port des Loginservers"
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:533
+msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:534
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:535
+msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:537
+msgid "  -O --no-opengl      : Disable OpenGL for this session"
 msgstr "  -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:539
+msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Verbinde mit [Kartenserver]..."
+#: src/main.cpp:544
+#, c-format
+msgid "The Mana World %s"
+msgstr "The Mana World %s"
+
+#: src/main.cpp:549
+msgid "hvud:U:P:Dc:s:p:C:H:S:Oi:"
+msgstr ""
+
+#: src/main.cpp:552
+msgid "config-file"
+msgstr ""
+
+#: src/main.cpp:554
+msgid "default"
+msgstr "Standard"
+
+#: src/main.cpp:555
+msgid "password"
+msgstr "Passwort:"
+
+#: src/main.cpp:556
+msgid "character"
+msgstr "Spielfigur"
+
+#: src/main.cpp:558
+msgid "home-dir"
+msgstr ""
+
+#: src/main.cpp:559
+msgid "update-host"
+msgstr "Updateserver: "
+
+#: src/main.cpp:562
+msgid "skip-update"
+msgstr ""
+
+#: src/main.cpp:563 src/main.cpp:681 src/main.cpp:795
+msgid "username"
+msgstr "Benutztername"
+
+#: src/main.cpp:564
+msgid "no-opengl"
+msgstr ""
+
+#: src/main.cpp:566
+msgid "screenshot-dir"
+msgstr "Bildschirmfotoordner"
+
+#: src/main.cpp:663 src/main.cpp:1134
+#, c-format
+msgid "Username is %s"
+msgstr "Benutzername ist %s"
+
+#: src/main.cpp:692
+msgid "LANG="
+msgstr ""
+
+#: src/main.cpp:694
+msgid "translations/"
+msgstr ""
+
+#: src/main.cpp:699
+msgid "UTF-8"
+msgstr ""
+
+#: src/main.cpp:756
+#, c-format
+msgid "Mana %s"
+msgstr "Mana: %s"
+
+#: src/main.cpp:759
+msgid "logToStandardOut"
+msgstr ""
+
+#: src/main.cpp:775
+msgid "loginMusic"
+msgstr "Loginmusik"
+
+#: src/main.cpp:775
+msgid "Magick - Real.ogg"
+msgstr ""
+
+#: src/main.cpp:914
+msgid "State: CHOOSE SERVER"
+msgstr ""
+
+#: src/main.cpp:937
+msgid "State: CONNECT SERVER"
+msgstr ""
+
+#: src/main.cpp:942
+msgid "State: LOGIN"
+msgstr ""
+
+#: src/main.cpp:959
+msgid "State: LOGIN ATTEMPT"
+msgstr ""
+
+#: src/main.cpp:964
+msgid "State: WORLD SELECT"
+msgstr ""
+
+#: src/main.cpp:991
+msgid "State: WORLD SELECT ATTEMPT"
+msgstr ""
+
+#: src/main.cpp:1010
+msgid "State: UPDATE"
+msgstr ""
+
+#: src/main.cpp:1017
+msgid "State: LOAD DATA"
+msgstr ""
+
+#: src/main.cpp:1025
+msgid "customdata/"
+msgstr ""
+
+#: src/main.cpp:1026
+msgid "zip"
+msgstr ""
+
+#: src/main.cpp:1046
+msgid "State: GET CHARACTERS"
+msgstr ""
+
+#: src/main.cpp:1051
+msgid "State: CHAR SELECT"
+msgstr ""
+
+#: src/main.cpp:1064 src/main.cpp:1079
+msgid "lastCharacter"
+msgstr "letzter Charakter"
+
+#: src/main.cpp:1070
+msgid "State: CONNECT GAME"
+msgstr ""
+
+#: src/main.cpp:1077
+#, c-format
+msgid "Memorizing selected character %s"
+msgstr "Speichere den gewählten Charakter %s"
+
+#: src/main.cpp:1097
+msgid "State: GAME"
+msgstr ""
+
+#: src/main.cpp:1109
+msgid "State: LOGIN ERROR"
+msgstr ""
+
+#: src/main.cpp:1116
+msgid "State: ACCOUNT CHANGE ERROR"
+msgstr ""
+
+#: src/main.cpp:1123
+msgid "State: REGISTER_PREP"
+msgstr ""
+
+#: src/main.cpp:1129
+msgid "State: REGISTER"
+msgstr ""
+
+#: src/main.cpp:1141
+msgid "State: CHANGE PASSWORD"
+msgstr ""
+
+#: src/main.cpp:1146
+msgid "State: CHANGE PASSWORD ATTEMPT"
+msgstr ""
+
+#: src/main.cpp:1153
+msgid "State: CHANGE PASSWORD SUCCESS"
+msgstr ""
+
+#: src/main.cpp:1154
+msgid "Password Change"
+msgstr "Passwort ändern:"
+
+#: src/main.cpp:1155
+msgid "Password changed successfully!"
+msgstr "Passwort erfolgreich geändert!"
+
+#: src/main.cpp:1163
+msgid "State: CHANGE EMAIL"
+msgstr ""
+
+#: src/main.cpp:1168
+msgid "State: CHANGE EMAIL ATTEMPT"
+msgstr ""
+
+#: src/main.cpp:1173
+msgid "State: CHANGE EMAIL SUCCESS"
+msgstr ""
+
+#: src/main.cpp:1174
+msgid "Email Change"
+msgstr "E-Mail ändern"
+
+#: src/main.cpp:1175
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "Mitglied wurde erfolgreich Befördert."
+
+#: 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
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Abmelden"
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
-msgstr "Verbinde mit [Charakterserver]..."
+#: src/main.cpp:1196
+msgid "Farewell, come back any time..."
+msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Verbinde mit [Benutzerdatenserver]..."
+#: src/main.cpp:1204
+msgid "State: SWITCH SERVER"
+msgstr ""
+
+#: src/main.cpp:1213
+msgid "State: SWITCH LOGIN"
+msgstr ""
+
+#: src/main.cpp:1221
+msgid "State: SWITCH CHARACTER"
+msgstr ""
+
+#: src/main.cpp:1230
+msgid "State: LOGOUT ATTEMPT"
+msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/main.cpp:1235
+msgid "State: WAIT"
+msgstr ""
+
+#: src/main.cpp:1239
+msgid "State: EXIT"
+msgstr ""
+
+#: src/main.cpp:1244
+msgid "State: FORCE QUIT"
+msgstr ""
+
+#: src/main.cpp:1251
+msgid "State: ERROR"
+msgstr ""
+
+#: src/main.cpp:1275
+msgid "Quitting"
+msgstr "Beenden"
+
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr "Spieler aus dem Kanal geworfen!"
 
+#: src/net/ea/adminhandler.cpp:98
+msgid "@kick "
+msgstr ""
+
+#: src/net/ea/adminhandler.cpp:108
+msgid "@ban "
+msgstr ""
+
+#: src/net/ea/adminhandler.cpp:118
+msgid "@unban "
+msgstr ""
+
 #: src/net/ea/buysellhandler.cpp:111
 msgid "Nothing to sell."
 msgstr "Du hast nichts zu verkaufen."
@@ -2227,65 +4551,70 @@ msgstr "Vielen Dank für den Verkauf."
 msgid "Unable to sell."
 msgstr "Verkauf fehlgeschlagen."
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: 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
+msgid "Access denied."
 msgstr "Zugang verweigert"
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:104
+msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht benutzen"
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:107
+msgid "Unknown failure to select character."
 msgstr "Unbekannter Fehler bei Auswahl des Charakters"
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:129
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
 "vergeben."
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Info"
-msgstr "Info"
-
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:142
 msgid "Character deleted."
 msgstr "Spieler gelöscht."
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:148
 msgid "Failed to delete character."
 msgstr "Spieler konnte nicht gelöscht werden."
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:309
 msgid "Strength:"
 msgstr "Stärke:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:242 src/net/manaserv/charhandler.cpp:310
 msgid "Agility:"
 msgstr "Agilität:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:243 src/net/manaserv/charhandler.cpp:312
 msgid "Vitality:"
 msgstr "Vitalität:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:244 src/net/manaserv/charhandler.cpp:313
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:245 src/net/manaserv/charhandler.cpp:311
 msgid "Dexterity:"
 msgstr "Geschicklichkeit:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:246
 msgid "Luck:"
 msgstr "Glück:"
 
+#: src/net/ea/charserverhandler.cpp:284
+msgid "a@a.com"
+msgstr ""
+
 #: src/net/ea/chathandler.cpp:78
 msgid "Whisper could not be sent, user is offline."
 msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
@@ -2295,6 +4624,15 @@ msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 "Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
+#: src/net/ea/chathandler.cpp:169
+msgid "MVP player."
+msgstr "Spieler"
+
+#: src/net/ea/chathandler.cpp:186
+#, c-format
+msgid "*%s*"
+msgstr ""
+
 #: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
 #: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
 #: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
@@ -2302,76 +4640,175 @@ msgstr ""
 msgid "Channels are not supported!"
 msgstr "Kanäle werden nicht unterstützt!"
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
-msgstr "Kann Gegenstand nicht Ausrüsten."
+#: src/net/ea/gamehandler.cpp:74
+#, c-format
+msgid "Protocol: Player start position: (%d, %d), Direction: %d"
+msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
-msgstr "Kann Gegenstand nicht ablegen."
+#: src/net/ea/gamehandler.cpp:87
+#, c-format
+msgid "Online users: %d"
+msgstr "Benutzer online: %d"
+
+#: src/net/ea/gamehandler.cpp:101
+msgid "Game"
+msgstr "Spiel"
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/gamehandler.cpp:101
+#, fuzzy
+msgid "Request to quit denied!"
+msgstr "Erbitte einen Handel"
+
+#: src/net/ea/generalhandler.cpp:73
+#, fuzzy
+msgid "EnableSync"
+msgstr "Joystick aktivieren"
+
+#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:97
+msgid "str"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:96 src/net/manaserv/generalhandler.cpp:97
 #, c-format
 msgid "Strength %+d"
 msgstr "Stärke %+d"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:97 src/net/manaserv/generalhandler.cpp:98
+#, fuzzy
+msgid "agi"
+msgstr "Magie"
+
+#: src/net/ea/generalhandler.cpp:97 src/net/manaserv/generalhandler.cpp:98
 #, c-format
 msgid "Agility %+d"
 msgstr "Beweglichkeit %+d"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:100
+#, fuzzy
+msgid "vit"
+msgstr "Sitzen"
+
+#: src/net/ea/generalhandler.cpp:98 src/net/manaserv/generalhandler.cpp:100
 #, c-format
 msgid "Vitality %+d"
 msgstr "Gesundheit %+d"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:99 src/net/manaserv/generalhandler.cpp:101
+#, fuzzy
+msgid "int"
+msgstr "Sitzen"
+
+#: src/net/ea/generalhandler.cpp:99 src/net/manaserv/generalhandler.cpp:101
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligenz %+d"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: 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
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Ausdauer %+d"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:101
+msgid "luck"
+msgstr "Glück"
+
+#: src/net/ea/generalhandler.cpp:101
 #, c-format
 msgid "Luck %+d"
 msgstr "Glück %+d"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:119
+#, c-format
+msgid "Connection problem: %i"
+msgstr "Verbindungsproblem: %i"
+
+#: src/net/ea/generalhandler.cpp:123
+msgid "Authentication failed."
 msgstr "Authentifizierung verweigert"
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:126
+msgid "No servers available."
 msgstr "Keine Server verfügbar"
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen"
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:133
+msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet"
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:136
+msgid "Speed hack detected."
 msgstr "Geschwindigkeitsproblem festgestellt"
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:139
+msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung"
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:142
+msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler"
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:197
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
+#: src/net/ea/generalhandler.cpp:209 src/net/manaserv/generalhandler.cpp:169
+msgid "Strength"
+msgstr "Stärke"
+
+#: src/net/ea/generalhandler.cpp:210 src/net/manaserv/generalhandler.cpp:170
+msgid "Agility"
+msgstr "Beweglichkeit"
+
+#: src/net/ea/generalhandler.cpp:211 src/net/manaserv/generalhandler.cpp:172
+msgid "Vitality"
+msgstr "Gesundheit"
+
+#: src/net/ea/generalhandler.cpp:212 src/net/manaserv/generalhandler.cpp:173
+msgid "Intelligence"
+msgstr "Intelligenz"
+
+#: src/net/ea/generalhandler.cpp:213 src/net/manaserv/generalhandler.cpp:171
+msgid "Dexterity"
+msgstr "Ausdauer"
+
+#: src/net/ea/generalhandler.cpp:214
+msgid "Luck"
+msgstr "Glück"
+
+#: src/net/ea/generalhandler.cpp:217
+msgid "Defense"
+msgstr "Verteidigung:"
+
+#: src/net/ea/generalhandler.cpp:218
+msgid "M.Attack"
+msgstr "M.Angriff:"
+
+#: src/net/ea/generalhandler.cpp:219
+msgid "M.Defense"
+msgstr "M.Verteidigung:"
+
+#: src/net/ea/generalhandler.cpp:220
+#, c-format
+msgid "% Accuracy"
+msgstr "% Accuracy"
+
+#: src/net/ea/generalhandler.cpp:221
+#, c-format
+msgid "% Evade"
+msgstr "% Evade"
+
+#: src/net/ea/generalhandler.cpp:222
+#, c-format
+msgid "% Critical"
+msgstr "% Critical"
+
 #: src/net/ea/gui/partytab.cpp:55
 msgid "/help > Display this help."
 msgstr "/help > Diese Hilfe anzeigen"
@@ -2420,10 +4857,18 @@ msgstr "Befehl: /create <Party-Name>"
 msgid "These commands create a new party called <party-name>."
 msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
 
+#: src/net/ea/gui/partytab.cpp:75 src/net/ea/gui/partytab.cpp:117
+msgid "invite"
+msgstr "einladen"
+
 #: src/net/ea/gui/partytab.cpp:77
 msgid "Command: /invite <nick>"
 msgstr "Befehl: /invite <Name>"
 
+#: src/net/ea/gui/partytab.cpp:82 src/net/ea/gui/partytab.cpp:121
+msgid "leave"
+msgstr "verlassen"
+
 #: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /leave"
 msgstr "Befehl: /leave"
@@ -2432,6 +4877,12 @@ msgstr "Befehl: /leave"
 msgid "This command causes the player to leave the party."
 msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
+#: src/net/ea/gui/partytab.cpp:87 src/net/ea/gui/partytab.cpp:129
+#: src/net/ea/gui/partytab.cpp:161 src/resources/itemdb.cpp:128
+#, fuzzy
+msgid "item"
+msgstr ""
+
 #: src/net/ea/gui/partytab.cpp:89
 msgid "Command: /item <policy>"
 msgstr "Befehl: /item <Wert>"
@@ -2460,6 +4911,11 @@ msgstr ""
 "Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
 "nicht."
 
+#: src/net/ea/gui/partytab.cpp:97 src/net/ea/gui/partytab.cpp:164
+#: src/net/ea/gui/partytab.cpp:196
+msgid "exp"
+msgstr ""
+
 #: src/net/ea/gui/partytab.cpp:99
 msgid "Command: /exp <policy>"
 msgstr "Befehl: /exp <Wert>"
@@ -2490,92 +4946,122 @@ msgstr ""
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:193
 msgid "Item sharing enabled."
 msgstr "Teilen von Gegenständen aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:199
 msgid "Item sharing disabled."
 msgstr "Teilen von Gegenständen deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:205
 msgid "Item sharing not possible."
 msgstr "Teilen von Gegenständen nicht möglich."
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:145
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Teilen von Gegenständen aktiviert."
+
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:170
 msgid "Experience sharing enabled."
 msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:176
 msgid "Experience sharing disabled."
 msgstr "Teilen der Erfahrungspunkte deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:177 src/net/ea/partyhandler.cpp:182
 msgid "Experience sharing not possible."
 msgstr "Teilen der Erfahrungspunkte nicht möglich."
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
-msgstr "Kann das nicht aufheben."
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
-msgstr "ein"
+#: src/net/ea/gui/partytab.cpp:180
+#, fuzzy
+msgid "Experience sharing unknown."
+msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/net/ea/inventoryhandler.cpp:199
+#: src/net/ea/inventoryhandler.cpp:152 src/net/ea/inventoryhandler.cpp:193
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]."
-msgstr "Du hast %s [@@%d|%s@@] aufgehoben."
+msgid ""
+"Index: %d, ID: %d, Type: %d, Identified: %d, Qty: %d, Cards: %d, %d, %d, %d"
+msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:262
 msgid "Failed to use item."
 msgstr "Gegenstand konnte nicht benutzt werden."
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:358
+msgid "Unable to equip."
+msgstr "Kann Gegenstand nicht Ausrüsten."
+
+#: src/net/ea/inventoryhandler.cpp:372
+msgid "Unable to unequip."
+msgstr "Kann Gegenstand nicht ablegen."
+
+#: src/net/ea/inventoryhandler.cpp:392
+#, c-format
+msgid "Arrows equipped: %i"
+msgstr "Pfeile ausgerüstet: %i"
+
+#: src/net/ea/loginhandler.cpp:78
 msgid "Account was not found. Please re-login."
 msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:81 src/net/manaserv/loginhandler.cpp:116
+msgid "Old password incorrect."
 msgstr "Altes Passwort fehlerhaft"
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:84
+msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz"
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp: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
+msgid "Unknown error."
 msgstr "Unbekannter Fehler"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:102
+#, c-format
+msgid "Received update host \"%s\" from login server."
+msgstr "Empfange Updateserver \"%s\" vom Loginserver"
+
+#: src/net/ea/loginhandler.cpp:131
+#, c-format
+msgid "Network: Server: %s (%s:%d)"
+msgstr "Netzwerk: Server: %s (%s:%d)"
+
+#: src/net/ea/loginhandler.cpp:143
+#, c-format
+msgid "Login::error code: %i"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:147
+msgid "Unregistered ID."
 msgstr "Unbekannte ID"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:150
+msgid "Wrong password."
 msgstr "Falsches Passwort"
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:153
+msgid "Account expired."
 msgstr "Account abgelaufen"
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:156
+msgid "Rejected from server."
 msgstr "Vom Server zurückgewiesen"
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:159
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM "
 "Team."
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:163
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -2584,38 +5070,144 @@ msgstr ""
 "Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
 "Bitte wende dich mittels des Forums an das GM Team."
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:170
+msgid "This user name is already taken."
 msgstr "Dieser Spielername ist bereits vergeben"
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/loginhandler.cpp:257
+msgid "_F"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:257
+msgid "_M"
+msgstr ""
+
+#: src/net/ea/network.cpp:138
+msgid "Tried to connect an already connected socket!"
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:149
+#, c-format
+msgid "Network::Connecting to %s:%i"
+msgstr ""
+
+#: src/net/ea/network.cpp:164
+msgid "Unable to create network worker thread"
+msgstr ""
+
+#: src/net/ea/network.cpp:232
+#, c-format
+msgid "Unhandled packet: %x"
+msgstr "Nicht behandeltes Paket : %x"
+
+#: src/net/ea/network.cpp:251
+msgid "Error in SDLNet_TCP_Send(): "
+msgstr ""
+
+#: src/net/ea/network.cpp:326
+#, c-format
+msgid "Received packet 0x%x of length %d\n"
+msgstr ""
+
+#: src/net/ea/network.cpp:342
+msgid "Unable to resolve host \""
+msgstr "Nicht möglich den host \" aufzulösen"
+
+#: src/net/ea/network.cpp:345
+#, c-format
+msgid "SDLNet_ResolveHost: %s"
+msgstr ""
+
+#: src/net/ea/network.cpp:354
+#, c-format
+msgid "Error in SDLNet_TCP_Open(): %s"
+msgstr ""
+
+#: src/net/ea/network.cpp:359
+#, c-format
+msgid "Network::Started session with %s:%i"
+msgstr ""
+
+#: src/net/ea/network.cpp:373
+msgid "Error in SDLNet_AllocSocketSet(): "
+msgstr ""
+
+#: src/net/ea/network.cpp:380
+msgid "Error in SDLNet_AddSocket(): "
+msgstr ""
+
+#: src/net/ea/network.cpp:393
+msgid "Error: SDLNet_CheckSockets"
+msgstr ""
+
+#: src/net/ea/network.cpp:407
+msgid "Disconnected."
+msgstr ""
+
+#: src/net/ea/network.cpp:411
+msgid "Connection to server terminated. "
+msgstr "Verbindung mit Server abgebrochen. "
+
+#: src/net/ea/network.cpp:438
+msgid "Error in SDLNet_TCP_Recv(), "
+msgstr ""
+
+#: src/net/ea/network.cpp:439
+msgid " sockets are ready: "
+msgstr ""
+
+#: src/net/ea/network.cpp:447
+#, c-format
+msgid "Error in SDLNet_DelSocket(): %s"
+msgstr ""
+
+#: src/net/ea/network.cpp:460
+#, c-format
+msgid "Network error: %s"
+msgstr "Netzwerkfehler: %s"
+
+#: src/net/ea/partyhandler.cpp:78
 msgid "Could not create party."
 msgstr "Konnte Party nicht erstellen."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Party successfully created."
 msgstr "Party erfolgreich erstellt."
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:116
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ist bereits Mitglied einer Party."
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:120
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:124
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s ist nun Mitglied Deiner Party."
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:128
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
+#: src/net/ea/partyhandler.cpp:185
+#, c-format
+msgid "Unknown party exp option: %d\n"
+msgstr "Unbekannte Party exp Option: %d\n"
+
+#: src/net/ea/partyhandler.cpp:208
+#, c-format
+msgid "Unknown party item option: %d\n"
+msgstr "Unbekannte Party Item Option: %d\n"
+
 #: src/net/ea/partyhandler.cpp:234
 msgid "You have left the party."
 msgstr "Du hast die Party verlassen."
@@ -2639,32 +5231,32 @@ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:268
 msgid "You are dead."
 msgstr "Ach ja: Du bist Tot."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:269
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 "Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:271
 msgid "You are not that alive anymore."
 msgstr "Du bist nicht länger lebendig."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:272
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Die kalten Hände des Sensemanns greifen nach Deiner Seele."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:273
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr "Gib eine Münze ein um weiter zuspielen."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:274
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2672,7 +5264,7 @@ msgstr ""
 "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
 "besserem Ort gegangen."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:276
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -2680,76 +5272,76 @@ msgstr ""
 "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
 "nicht ganz so genial, wie Du dachtest..."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:278
 msgid "I guess this did not run too well."
 msgstr "Ich glaube, das war nicht so gut."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:279
 msgid "Do you want your possessions identified?"
 msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:280
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:281
 msgid "Annihilated."
 msgstr "Vernichtet."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:282
 msgid "Looks like you got your head handed to you."
 msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:283
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir ein "
 "paar Neue."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr "Du bist nicht tot. Du erholst Dich bloß."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr "Du bist nicht mehr."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr "Du bist ein wenig steif."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr "Des Lebens beraubt ruhst Du in Frieden."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
 "sehen."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr "Deine Körperfunktionen sind nun Geschichte."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr "Du kriegst nichts mehr mit."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr "Jetzt passt Du in 'nen Eimer."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -2757,118 +5349,143 @@ msgstr ""
 "Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
 "und Du trittst dem Chor der blutenden Unsichtbaren bei."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr "Du warst einmal ein Spieler."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr "Du schmachtest nach den Fjorden."
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:184
+#, c-format
+msgid "Warping to %s (%d, %d)"
+msgstr "Flüsternd zu %s: (%d ,%d)"
+
+#: src/net/ea/playerhandler.cpp:214
+#, c-format
+msgid "Adjust scrolling by %d:%d"
+msgstr "Justiere Scrolling %d:%d"
+
+#: src/net/ea/playerhandler.cpp:242 src/net/ea/playerhandler.cpp:303
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:243
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
-msgstr "Aufgehoben "
+#: src/net/ea/playerhandler.cpp:324
+#, c-format
+msgid "You picked up %s."
+msgstr "Du hast %s aufgehoben "
+
+#: src/net/ea/playerhandler.cpp:360
+msgid "Cannot raise skill!"
+msgstr "Kann Skill nicht erhöhen!"
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:521
 msgid "Equip arrows first."
 msgstr "Rüste dich zuerst mit Pfeilen aus."
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:525
+#, c-format
+msgid "0x013b: Unhandled message %i"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:138
+#, c-format
+msgid "Action: %d/%d"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr "Handel fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr "Emote fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr "Sitzen fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr "Chat-Erstellung fehlgeschlagen!"
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr "Kann der Gruppe nicht beitreten!"
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Kann nicht rufen!"
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Dein Level ist noch nicht hoch genug!"
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr "Nicht genug HP!"
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr "Nicht genug SP!"
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Keine Memos vorhanden!"
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Du kannst dies momentan nicht tun!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr "Du brauchst noch einen roten Edelstein!"
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr "Du brauchst noch einen blauen Edelstein!"
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Du schleppst zu viel herum um das zu machen!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "Eha? Was ist das?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr "Warp fehlgeschlagen..."
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr "Konnte nichts stehlen..."
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Das Gift hatte keine Wirkung..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:117
 msgid "Request for Trade"
 msgstr "Erbitte einen Handel"
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:118
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s möchte mit dir handeln, stimmst du zu?"
@@ -2914,111 +5531,312 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:150
 msgid "Trade canceled."
 msgstr "Handel abgebrochen."
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:157
 msgid "Trade completed."
 msgstr "Handel abgeschlossen."
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
-msgstr " Drücke \"OK\" um neu anzufangen."
+#: src/net/manaserv/beinghandler.cpp:288
+msgid "Press OK to respawn."
+msgstr "Drücke \"OK\" um neu anzufangen."
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:289
+msgid "You Died"
 msgstr "Du bist tot."
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:108
+msgid "Player deleted."
+msgstr "Spieler gelöscht"
+
+#: src/net/manaserv/charhandler.cpp:118 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr "nicht angemeldet"
+
+#: src/net/manaserv/charhandler.cpp:121
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
+
+#: src/net/manaserv/charhandler.cpp:199
+msgid "No empty slot."
+msgstr "Kein freier Slot."
+
+#: src/net/manaserv/charhandler.cpp:202
+msgid "Invalid name."
+msgstr "Ungültiger Name."
+
+#: src/net/manaserv/charhandler.cpp:205
+msgid "Character's name already exists."
+msgstr "Benutzername bereits vorhanden"
+
+#: src/net/manaserv/charhandler.cpp:208
+msgid "Invalid hairstyle."
+msgstr "Ungültiger Haarstil."
+
+#: src/net/manaserv/charhandler.cpp:211
+msgid "Invalid hair color."
+msgstr "Ungültige Haarfarbe."
+
+#: src/net/manaserv/charhandler.cpp:214
+msgid "Invalid gender."
+msgstr "Ungültiges Geschlecht."
+
+#: src/net/manaserv/charhandler.cpp:217
+msgid "Character's stats are too high."
+msgstr "Spielfigurattribute sind zu groß."
+
+#: src/net/manaserv/charhandler.cpp:220
+msgid "Character's stats are too low."
+msgstr "Spielfigurattribute sind zu klein"
+
+#: src/net/manaserv/charhandler.cpp:223
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:260
+#, c-format
+msgid "Game server: %s:%d"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:262
+#, c-format
+msgid "Chat server: %s:%d"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:291
 msgid "No gameservers are available."
 msgstr "Kein Server verfügbar"
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:314
 msgid "Willpower:"
 msgstr "Willenskraft:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:132
+msgid "Chatserver: Not logged in"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:135
+msgid "Chatserver: Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: src/net/manaserv/chathandler.cpp:165
+msgid "Unknown : "
+msgstr "Unbekannt: "
+
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:265
 #, c-format
 msgid "Topic: %s"
 msgstr "Thema: %s"
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr "Spieler im Kanal:"
+
+#: src/net/manaserv/chathandler.cpp:193 src/net/manaserv/chathandler.cpp:273
+msgid "@"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr "Fehler beim Betreten des Kanals."
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr "Liste Kanäle"
+
+#: src/net/manaserv/chathandler.cpp:215
+msgid " - "
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s ist dem Kanal beigetreten."
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Unbekannter Befehl."
+
+#: src/net/manaserv/generalhandler.cpp:102
+#, fuzzy
+msgid "will"
+msgstr "Fertigkeiten"
+
+#: src/net/manaserv/generalhandler.cpp:102
 #, c-format
 msgid "Willpower %+d"
 msgstr "Willensstärke %+d"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:174
+msgid "Willpower"
+msgstr "Willenskraft:"
+
+#: src/net/manaserv/guildhandler.cpp:76
+msgid "Received CPMSG_GUILD_CREATE_RESPONSE"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:80
 msgid "Guild created."
 msgstr "Gilde erstellt."
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:85
 msgid "Error creating guild."
 msgstr "Fehler beim Erstellen der Gilde."
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:91
+msgid "Received CPMSG_GUILD_INVITE_RESPONSE"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:95
 msgid "Invite sent."
 msgstr "Einladung gesendet."
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:101
+msgid "Received CPMSG_GUILD_ACCEPT_RESPONSE"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:111
+msgid "Received CPMSG_GUILD_GET_MEMBERS_RESPONSE"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:145
+msgid "Received CPMSG_GUILD_UPDATE_LIST"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:183
+#, fuzzy
+msgid "Invalid guild event"
+msgstr "Ungültiger Updateserver: "
+
+#: src/net/manaserv/guildhandler.cpp:193
+msgid "Received CPMSG_GUILD_INVITED"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:204
+msgid "Received CPMSG_GUILD_PROMOTE_MEMBER_RESPONSE"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:209
 msgid "Member was promoted successfully."
 msgstr "Mitglied wurde erfolgreich Befördert."
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:214
 msgid "Failed to promote member."
 msgstr "Beförderung des Mitglieds gescheitert."
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: 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
+msgid "Wrong magic_token."
 msgstr "Fehlerhaftes Magiemerkmal"
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:260
+msgid "Already logged in."
 msgstr "Bereits angemeldet"
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:263
+msgid "Server is full."
 msgstr "Server ist voll"
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:113
+msgid "New password incorrect."
 msgstr "Neues Passwort fehlerhaft"
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:119 src/net/manaserv/loginhandler.cpp:149
 msgid "Account not connected. Please login first."
 msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
-msgstr "Neue Emailadresse ist fehlerhaft"
-
 #: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
-msgstr "Alte Emailadresse ist fehlerhaft"
+msgid "New email address incorrect."
+msgstr "Neue E-Mailadresse ist fehlerhaft"
+
+#: src/net/manaserv/loginhandler.cpp:146
+msgid "Old email address incorrect."
+msgstr "Alte E-Mailadresse ist fehlerhaft"
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "The new email address already exists."
+msgstr "Die neue E-Mailadresse ist bereits vorhanden."
+
+#: src/net/manaserv/loginhandler.cpp:176
+msgid "Accountserver: Not logged in"
+msgstr "nicht angemeldet"
+
+#: src/net/manaserv/loginhandler.cpp:179 src/net/manaserv/loginhandler.cpp:203
+msgid "Accountserver: Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: src/net/manaserv/loginhandler.cpp:200
+msgid "Accountserver: Wrong username or password"
+msgstr "Benutzername oder Passwort falsch"
+
+#: src/net/manaserv/loginhandler.cpp:222
+#, c-format
+msgid "%s: %s\n"
+msgstr "%s: %s\n"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
-msgstr "Die neue Emailadresse ist bereits vorhanden."
+#: src/net/manaserv/loginhandler.cpp:231
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:254 src/net/manaserv/loginhandler.cpp:290
+msgid "Client version is too old."
 msgstr "Die Version des Spiels ist zu alt"
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:257
+msgid "Wrong username or password."
 msgstr "Benutzername oder Passwort falsch"
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
-msgstr "Benutzername, Passwort oder Emailadresse falsch"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:293
+msgid "Wrong username, password or email address."
+msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
+
+#: src/net/manaserv/loginhandler.cpp:296
+msgid "Username already exists."
 msgstr "Benutzername bereits vorhanden"
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
-msgstr "Emailadresse bereits vorhanden"
+#: src/net/manaserv/loginhandler.cpp:299
+msgid "Email address already exists."
+msgstr "E-Mailadresse bereits vorhanden"
+
+#: src/net/manaserv/loginhandler.cpp:302
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
 
 #: src/net/manaserv/partyhandler.cpp:86
 msgid "Joined party."
@@ -3029,60 +5847,570 @@ msgstr "Der Party beigetreten."
 msgid "%s joined the party."
 msgstr "%s ist der Party beigetreten."
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:120
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
+
+#: src/net/manaserv/playerhandler.cpp:132
+#, c-format
+msgid "Changing server to %s:%d"
+msgstr ""
+
+#: src/net/manaserv/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 "Levelaufstiegsfortschritt"
+
+#: 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 "Akzeptiere eingehende Handelsanfragen."
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr "Ignoriere eingehende Handelsanfragen."
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:136
 #, c-format
 msgid "Trading with %s"
 msgstr "Handele mit %s"
 
+#: src/playerrelations.cpp:34
+msgid "nop"
+msgstr "Nö"
+
+#: src/playerrelations.cpp:35
+#, fuzzy
+msgid "emote0"
+msgstr "Gefühle"
+
+#: src/playerrelations.cpp:39
+msgid "relation"
+msgstr "Beziehung"
+
+#: 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 "Spieler"
+
+#: src/playerrelations.cpp:296
+msgid "Completely ignore"
+msgstr "@@ignore|Ignoriere %s komplett@@"
+
+#: src/playerrelations.cpp:310
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:311
+msgid "dotdotdot"
+msgstr ""
+
+#: src/playerrelations.cpp:316
+msgid "..."
+msgstr ""
+
+#: src/playerrelations.cpp:326
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:327
+#, fuzzy
+msgid "blinkname"
+msgstr "Unbenannt"
+
+#: src/playerrelations.cpp:363
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:366
+msgid "Floating bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:367
+#, fuzzy
+msgid "emote1"
+msgstr "Gefühle"
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
 msgstr "Angriff %+d"
 
 #: src/resources/itemdb.cpp:53
+msgid "defense"
+msgstr "Verteidigung:"
+
+#: src/resources/itemdb.cpp:53
 #, c-format
 msgid "Defense %+d"
 msgstr "Verteidigung %+d"
 
 #: src/resources/itemdb.cpp:54
+#, fuzzy
+msgid "hp"
+msgstr "Geschäft"
+
+#: src/resources/itemdb.cpp:54
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
 #: src/resources/itemdb.cpp:55
+msgid "mp"
+msgstr ""
+
+#: src/resources/itemdb.cpp:55
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
+#: src/resources/itemdb.cpp:67
+msgid "generic"
+msgstr "Allgemeiner Gegenstand"
+
+#: src/resources/itemdb.cpp:68
+msgid "usable"
+msgstr "Benutzbare Gegenstände"
+
+#: src/resources/itemdb.cpp:69
+msgid "equip-1hand"
+msgstr "Einhänder"
+
+#: src/resources/itemdb.cpp:70
+msgid "equip-2hand"
+msgstr "Zweihänder"
+
+#: src/resources/itemdb.cpp:71
+msgid "equip-torso"
+msgstr ""
+
+#: src/resources/itemdb.cpp:72
+msgid "equip-arms"
+msgstr "Armausrüstung"
+
+#: src/resources/itemdb.cpp:73
+msgid "equip-head"
+msgstr "Kopfbedeckung"
+
+#: src/resources/itemdb.cpp:74
+msgid "equip-legs"
+msgstr "Beinausrüstung"
+
+#: src/resources/itemdb.cpp:75
+msgid "equip-shield"
+msgstr "Schilde"
+
+#: src/resources/itemdb.cpp:76
+msgid "equip-ring"
+msgstr "Ring"
+
+#: src/resources/itemdb.cpp:77
+msgid "equip-necklace"
+msgstr "Halsketten"
+
+#: src/resources/itemdb.cpp:78
+msgid "equip-feet"
+msgstr "Schuhe & Stiefel"
+
+#: src/resources/itemdb.cpp:79
+msgid "equip-ammo"
+msgstr "Waffe"
+
+#: src/resources/itemdb.cpp:85
+msgid "knife"
+msgstr "Messer"
+
+#: src/resources/itemdb.cpp:86
+msgid "sword"
+msgstr "Schwert"
+
+#: src/resources/itemdb.cpp:87
+msgid "polearm"
+msgstr "Waffenarm"
+
+#: src/resources/itemdb.cpp:88
+msgid "staff"
+msgstr "Stab"
+
+#: src/resources/itemdb.cpp:89
+msgid "whip"
+msgstr "Peitsche"
+
+#: src/resources/itemdb.cpp:90
+msgid "bow"
+msgstr "Bogen"
+
+#: src/resources/itemdb.cpp:91
+msgid "shooting"
+msgstr "schießen"
+
+#: src/resources/itemdb.cpp:92
+msgid "mace"
+msgstr "Irrgarten"
+
+#: src/resources/itemdb.cpp:93
+msgid "axe"
+msgstr "Axt"
+
+#: src/resources/itemdb.cpp:94
+msgid "thrown"
+msgstr "geworfen"
+
+#: src/resources/itemdb.cpp:110
+msgid "Initializing item database..."
+msgstr ""
+
 #: src/resources/itemdb.cpp:113
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr "Unbenannt"
+#: src/resources/itemdb.cpp:121
+msgid "items"
+msgstr ""
+
+#: src/resources/itemdb.cpp:123
+msgid "ItemDB: Error while loading items.xml!"
+msgstr "Fehler beim Laden von item.xml!"
+
+#: 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 "andere"
 
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:144
+msgid "weight"
+msgstr "Gewicht:"
+
+#: src/resources/itemdb.cpp:145
+msgid "view"
+msgstr "Ansicht"
+
+#: src/resources/itemdb.cpp:148
+msgid "image"
+msgstr "Bild"
+
+#: src/resources/itemdb.cpp:150
+msgid "weapon-type"
+msgstr "Waffentyp"
+
+#: src/resources/itemdb.cpp:151
+msgid "attack-range"
+msgstr "Angriffsreichweite"
+
+#: src/resources/itemdb.cpp:156 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr "unbenannt"
 
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
+#: src/resources/itemdb.cpp:180
+msgid "effect"
+msgstr "Effekt:"
+
+#: 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 "Partikeleffekte"
+
+#: 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
+#, fuzzy
+msgid "unisex"
+msgstr "benutze"
+
+#: src/resources/itemdb.cpp:294
+msgid "male"
+msgstr "Männlich"
+
+#: src/resources/itemdb.cpp:298
+msgid "female"
+msgstr "Weiblich"
+
+#: src/resources/itemdb.cpp:306 src/resources/monsterdb.cpp:101
+#, fuzzy
+msgid "event"
+msgstr "Letzter Server:"
+
+#: src/resources/itemdb.cpp:309 src/resources/monsterdb.cpp:105
+msgid "hit"
+msgstr "getroffen"
+
+#: 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 "Monster"
+
+#: src/resources/monsterdb.cpp:54
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: src/resources/monsterdb.cpp:60
+msgid "monster"
+msgstr "Monster"
+
+#: src/resources/monsterdb.cpp:70
+msgid "targetCursor"
+msgstr ""
+
+#: src/resources/monsterdb.cpp:71
+msgid "small"
+msgstr "klein"
+
+#: src/resources/monsterdb.cpp:79
+msgid "large"
+msgstr "groß"
+
+#: 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 "verfehlt"
+
+#: src/resources/monsterdb.cpp:113
+msgid "hurt"
+msgstr "verletzten"
+
+#: 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
+#, fuzzy
+msgid "action"
+msgstr "Beziehung"
+
+#: src/resources/monsterdb.cpp:138
+msgid "particlefx"
+msgstr "als Partikeleffekt"
+
+#: src/resources/monsterdb.cpp:165
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#~ msgid "Are you sure you want to quit?"
+#~ msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+
+#~ msgid "Buddy"
+#~ msgstr "Freund"
+
+#~ msgid "Buddy List"
+#~ msgstr "Freundesliste"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Beruf Stufe: %d"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Spruch 1 sprechen"
+
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Spruch 2 sprechen"
+
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Spruch 3 sprechen"
+
+#~ msgid "2 Handed Weapons"
+#~ msgstr "zweihändige Waffen"
+
+#~ msgid "Failed to switch to "
+#~ msgstr "Konnte Auflösung nicht ändern in "
+
+#~ msgid "Mystery Skill"
+#~ msgstr "Unbekannter Skill"
+
+#~ msgid "Up"
+#~ msgstr "Erhöhen"
+
+#~ msgid "Weapons"
+#~ msgstr "Waffen"
+
+#~ msgid "Crafts"
+#~ msgstr "Handwerk"
+
+#~ msgid "Stats"
+#~ msgstr "Fähigkeiten"
+
+#~ msgid "Total"
+#~ msgstr "Gesamt"
+
+#~ msgid "Cost"
+#~ msgstr "Preis"
+
+#~ msgid "Attack:"
+#~ msgstr "Angriff:"
+
+#~ msgid "% Reflex:"
+#~ msgstr "% Reaktion:"
+
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Verbleibende Statuspunkte: %d"
+
+#~ msgid "Max level"
+#~ msgstr "Max Level"
+
+#~ msgid "curl error "
+#~ msgstr "curl fehler "
+
+#~ msgid "Buddys"
+#~ msgstr "Freunde"
+
+#~ msgid "Unarmed"
+#~ msgstr "Unbewaffnet"
+
+#~ msgid "Bow"
+#~ msgstr "Bogen"
+
+#~ msgid "Axe"
+#~ msgstr "Axt"
+
+#~ msgid "Craft"
+#~ msgstr "Handwerk"
+
+#~ msgid "Couldn't set "
+#~ msgstr "Konnte Einstellung nicht setzen: "
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "Verbinde mit [Charakterserver]..."
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Verbinde mit [Benutzerdatenserver]..."
+
+#~ msgid "a"
+#~ msgstr "ein"
 
 #~ msgid "Select Character"
 #~ msgstr "Spielfigur auswählen"
 
-#~ msgid "MiniMap"
-#~ msgstr "Übersichtskarte"
-
 #~ msgid "Scroll radius"
 #~ msgstr "Scroll-Radius"
 
@@ -3095,15 +6423,6 @@ msgstr "unbenannt"
 #~ msgid "Unable to load selection.png"
 #~ msgstr "Konnte selection.png nicht laden"
 
-#~ msgid "Emote"
-#~ msgstr "Gefühle"
-
-#~ msgid "inc"
-#~ msgstr "Verringern"
-
-#~ msgid "use"
-#~ msgstr "benutze"
-
 #~ msgid " cancelled"
 #~ msgstr " abgebrochen"
 
@@ -3123,32 +6442,8 @@ msgstr "unbenannt"
 #~ msgid "NPC Text Request"
 #~ msgstr "NPC text Anfrage"
 
-#~ msgid "skills.xml"
-#~ msgstr "skills.xml"
-
 #~ msgid "Slots: "
 #~ msgstr "Plätze: "
 
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
-
 #~ msgid "Emote Window"
 #~ msgstr "Gefühlsfenster"
-
-#~ msgid "Player deleted"
-#~ msgstr "Spieler gelöscht"
-
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
-
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
-
-#~ msgid "; "
-#~ msgstr "; "
-
-#~ msgid "+"
-#~ msgstr "+"
-
-#~ msgid "-"
-#~ msgstr "-"
diff --git a/po/mana.pot b/po/mana.pot
index b1946f02..9d3fc597 100644
--- a/po/mana.pot
+++ b/po/mana.pot
@@ -3,594 +3,1134 @@
 # 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: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-31 15:55+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=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: 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"
+msgstr ""
+
+#: src/commandhandler.cpp:68 src/commandhandler.cpp:289
+msgid "who"
+msgstr ""
+
+#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
+msgid "msg"
+msgstr ""
+
+#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
+#: src/gui/popupmenu.cpp:227
+msgid "whisper"
+msgstr ""
+
+#: src/commandhandler.cpp:72 src/commandhandler.cpp:229
+msgid "w"
+msgstr ""
+
+#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
+msgid "query"
+msgstr ""
+
+#: src/commandhandler.cpp:76 src/commandhandler.cpp:238
+msgid "q"
+msgstr ""
+
+#: src/commandhandler.cpp:80 src/commandhandler.cpp:207
+#: src/gui/popupmenu.cpp:238 src/gui/widgets/whispertab.cpp:84
+#: src/gui/widgets/whispertab.cpp:103
+msgid "ignore"
+msgstr ""
+
+#: src/commandhandler.cpp:84 src/commandhandler.cpp:278
+#: src/gui/popupmenu.cpp:231 src/gui/widgets/whispertab.cpp:90
+#: src/gui/widgets/whispertab.cpp:107
+msgid "unignore"
+msgstr ""
+
+#: src/commandhandler.cpp:88 src/commandhandler.cpp:213
+msgid "join"
+msgstr ""
+
+#: src/commandhandler.cpp:92 src/commandhandler.cpp:219
+msgid "list"
+msgstr ""
+
+#: src/commandhandler.cpp:96 src/commandhandler.cpp:202
+msgid "clear"
+msgstr ""
+
+#: src/commandhandler.cpp:100 src/commandhandler.cpp:245
+#: src/gui/popupmenu.cpp:327
+msgid "party"
+msgstr ""
+
+#: src/commandhandler.cpp:104 src/commandhandler.cpp:224
+msgid "me"
+msgstr ""
+
+#: src/commandhandler.cpp:108 src/commandhandler.cpp:259
+msgid "record"
+msgstr ""
+
+#: src/commandhandler.cpp:112 src/commandhandler.cpp:267
+#: src/commandhandler.cpp:435
+msgid "toggle"
+msgstr ""
+
+#: src/commandhandler.cpp:116 src/commandhandler.cpp:252
+msgid "present"
+msgstr ""
+
+#: src/commandhandler.cpp:122 src/commandhandler.cpp:297
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:142
+#: 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
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:152
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:154
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:155
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:156
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:158
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:160
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:161
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:162
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:163
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:164
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:166
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:167
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:169
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:170
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:172
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:174
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:175
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:176
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:178
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:182
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:186
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:187
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:188
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:189
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:197
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:198
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:199
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:204
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:205
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:209
+msgid "Command: /ignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:210
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+
+#: src/commandhandler.cpp:215
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:216
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:217
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:221
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:222
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:226
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:227
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:231
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:232
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:233
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:234
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
-#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
+#: src/commandhandler.cpp:235 src/commandhandler.cpp:249
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
 #: src/net/ea/gui/partytab.cpp:79
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:240
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:241
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:242
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:247
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:248 src/net/ea/gui/partytab.cpp:78
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:254
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:255
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:261
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:262
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:264
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:265
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:269
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:270
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:272
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:275
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:276
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:280 src/gui/widgets/whispertab.cpp:92
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/commandhandler.cpp:281
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:286
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:287
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:291
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:292
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:298
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:340
+#: 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
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:372
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:386
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:400 src/commandhandler.cpp:448
+#: src/commandhandler.cpp:470
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:418
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:418
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:427
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:431
 msgid "Message now closes chat."
 msgstr ""
 
+#: src/commandhandler.cpp:454
+msgid "Player already ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:461
+msgid "Player successfully ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:463
+msgid "Player could not be ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:478
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:483
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:485
+msgid "Player could not be unignored!"
+msgstr ""
+
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/engine.cpp:80
+msgid "maps/"
+msgstr ""
+
+#: src/engine.cpp:80
+msgid ".tmx"
 msgstr ""
 
-#: src/engine.cpp:89
+#: src/engine.cpp:83
+msgid ".gz"
+msgstr ""
+
+#: src/engine.cpp:90 src/engine.cpp:92
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/game.cpp:237
+#: 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
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/game.cpp:242
+msgid "logToChat"
+msgstr ""
+
+#: src/game.cpp:305 src/net/ea/playerhandler.cpp:195
+msgid "."
 msgstr ""
 
-#: src/game.cpp:409
+#: 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
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:410
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:411
+msgid "Error: could not save screenshot."
+msgstr ""
+
+#: src/game.cpp:486
+msgid "The connection to the server was lost."
 msgstr ""
 
 #: src/game.cpp:491
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:657 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
-#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
-#: src/keyboardconfig.cpp:101
-msgid "Quit"
+#: src/game.cpp:534 src/game.cpp:896
+#, c-format
+msgid "Warning: guichan input exception: %s"
 msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: 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"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:567 src/gui/itemamount.cpp:100 src/gui/itemamount.cpp:201
+#: src/gui/npcdialog.cpp:93 src/gui/npcdialog.cpp:154 src/gui/okdialog.cpp:42
+#: src/gui/okdialog.cpp:80 src/gui/quitdialog.cpp:46
+#: src/gui/quitdialog.cpp:105 src/gui/register.cpp:53
+#: src/gui/serverdialog.cpp:186 src/gui/trade.cpp:232 src/gui/trade.cpp:295
+#: src/main.cpp:984
+msgid "ok"
 msgstr ""
 
-#: src/game.cpp:805
-msgid "Ignoring incoming trade requests"
+#: src/game.cpp:707
+msgid "index"
 msgstr ""
 
-#: src/game.cpp:812
-msgid "Accepting incoming trade requests"
+#: src/game.cpp:853
+msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:860
+msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/gui/buy.cpp:47 src/gui/buy.cpp:50 src/gui/buy.cpp:76
+#: src/gui/buysell.cpp:42 src/gui/buysell.cpp:86
+msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
-msgid "Buy"
+#: 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:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:67 src/gui/buy.cpp:262 src/gui/sell.cpp:69
+#: src/gui/sell.cpp:280
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
+#: 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
+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
+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
+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/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
 msgid "Max"
 msgstr ""
 
-#: src/gui/buy.cpp:73 src/gui/buy.cpp:223 src/gui/buy.cpp:241
-#: src/gui/sell.cpp:75 src/gui/sell.cpp:250 src/gui/sell.cpp:264
+#: 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:74 src/gui/buy.cpp:225 src/gui/buy.cpp:242
-#: src/gui/sell.cpp:76 src/gui/sell.cpp:252 src/gui/sell.cpp:265
+#: 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/buysell.cpp:34
+#: 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:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:38
+msgid "BuySell"
+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
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp: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/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp: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."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/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:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp: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:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 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 ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
 #: src/gui/charcreatedialog.cpp:54
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:68 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#: src/gui/charcreatedialog.cpp:71 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+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
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:189
+msgid "prevcolor"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:75
+msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73
+#: 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
+msgid "Hair style:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:79 src/gui/charselectdialog.cpp:364
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: 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
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: 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
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:100 src/gui/charcreatedialog.cpp:245
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
+#: src/gui/charcreatedialog.cpp:178
+msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:173
-msgid "Your name needs to be at least 4 characters."
+#: src/gui/charcreatedialog.cpp:204 src/gui/charcreatedialog.cpp:303
+msgid "statslider"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:237
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:249
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:67
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:68
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:95
+#: 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
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:66
-#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
-msgid "OK"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:105
-msgid "Previous"
+#: src/gui/charselectdialog.cpp:127 src/gui/charselectdialog.cpp:187
+msgid "switch"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
+#: src/gui/charselectdialog.cpp:146 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
+#: src/gui/charselectdialog.cpp:147 src/gui/charselectdialog.cpp:217
+#: src/gui/unregisterdialog.cpp:55 src/gui/unregisterdialog.cpp:101
+msgid "unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
+#: src/gui/charselectdialog.cpp:154
+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:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
+#: src/gui/charselectdialog.cpp:307
+msgid "(888)"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:310 src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
+#: src/gui/charselectdialog.cpp:354
+msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:119
+#: src/gui/charselectdialog.cpp:356
 #, c-format
-msgid "Money: %d"
+msgid "%s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
+#: src/gui/charselectdialog.cpp:357
 #, c-format
-msgid "Job Level: %d"
+msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:366 src/gui/charselectdialog.cpp:367
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:75 src/gui/chat.cpp:79 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: 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
 #, c-format
-msgid "%d players are present."
+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:327
-msgid "Present: "
+#: src/gui/chat.cpp:311 src/gui/widgets/chattab.cpp:175
+msgid "] "
 msgstr ""
 
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:314
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: 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
 #, 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 ""
@@ -599,167 +1139,437 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
+#: 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/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
+#: src/gui/connectiondialog.cpp:56
+msgid "Cancel pressed"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:43 src/gui/debugwindow.cpp:45
+msgid "Debug"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:65
+#, c-format
+msgid "Music: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:66
+#, c-format
+msgid "Map: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:67
+#, c-format
+msgid "Minimap: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:96
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:116
+#, 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
+#, c-format
+msgid "Particle detail: %s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:126
+#, 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
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
+#: 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
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
+#: 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:63
+#: src/gui/guildwindow.cpp:67
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
+#: 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:65
+#: 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/help.cpp:34
+#: 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
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:49 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:70
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: 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
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:71 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:285 src/gui/popupmenu.cpp:372
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:289 src/gui/popupmenu.cpp:375
+#: src/gui/specialswindow.cpp:213
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:82 src/gui/inventorywindow.cpp:293
+#: src/gui/popupmenu.cpp:378
+msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:81
+#: 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
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: 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
+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
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:96
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
+#: 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
+msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:97
+#: 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
+msgid "OK"
+msgstr ""
+
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: 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 ""
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr ""
 
+#: src/gui/itempopup.cpp:40
+msgid "ItemPopup"
+msgstr ""
+
 #: src/gui/itempopup.cpp:91
-msgid "Weight: "
+#, c-format
+msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
-#: src/gui/widgets/chattab.cpp:135
-msgid "Server:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:56
-msgid "Recent:"
+#: 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:73
-msgid "Remember Username"
+#: src/gui/login.cpp:60
+msgid "Change Server"
 msgstr ""
 
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
-msgid "Register"
+#: src/gui/login.cpp:60 src/gui/login.cpp:112 src/gui/serverdialog.cpp:372
+#: src/main.cpp:561
+msgid "server"
 msgstr ""
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
+#: 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/magic.cpp:39
-msgid "Cast Test Spell 1"
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
+msgid "Map"
 msgstr ""
 
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
+#: src/gui/minimap.cpp:51
+msgid "Minimap"
 msgstr ""
 
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
+#: src/gui/minimap.cpp:52 src/gui/minimap.cpp:71
+msgid "Show"
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
-msgid "Map"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:44
+msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:46
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:56
+msgid "NpcText"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:106
 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
+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
 msgid "To:"
 msgstr ""
@@ -768,10 +1578,57 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
+#: src/gui/npcpostdialog.cpp:51 src/gui/npcpostdialog.cpp:81
+msgid "send"
+msgstr ""
+
 #: src/gui/npcpostdialog.cpp:85
 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
+#, 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 "  "
+msgstr ""
+
 #: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
 msgid "Text"
 msgstr ""
@@ -788,341 +1645,432 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/gui/partywindow.cpp:55
+#: src/gui/partywindow.cpp:57 src/gui/partywindow.cpp:83
+#: src/net/ea/gui/partytab.cpp:39
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/chathandler.cpp:98
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:103
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:104
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:106
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:107
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:108
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:109
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:110
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:111
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:113
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:114
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:115
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:116
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:117
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:118
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:119
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:120
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:121
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:122
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:123
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:124
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:125
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:126
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:128
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:129
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:130
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:132
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:134
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:135
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:136
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:138
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:139
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:140
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:141
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
+#: 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:174
+#: src/gui/partywindow.cpp:178
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/partywindow.cpp:182
+#: src/gui/partywindow.cpp:186
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/partywindow.cpp:189
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/partywindow.cpp:191
+#: src/gui/partywindow.cpp:195
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/partywindow.cpp:208
 #, c-format
 msgid "Accepted invite from %s."
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/partywindow.cpp:215
 #, c-format
 msgid "Rejected invite from %s."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
+#: src/gui/popupmenu.cpp:58
+msgid "PopupMenu"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:89
+#: src/gui/popupmenu.cpp:84
 #, c-format
-msgid "@@trade|Trade With %s@@"
+msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:160
 #, c-format
-msgid "@@attack|Attack %s@@"
+msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:92
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:100
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:105
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:108
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:117
 #, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:132
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:136
+#, c-format
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
+#: src/gui/popupmenu.cpp:143
+msgid "Kick player"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152
 #, c-format
-msgid "@@talk|Talk To %s@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:165
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
+#: src/gui/popupmenu.cpp:173
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:190
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:398
+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:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: 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:356
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:229
+msgid "/w \""
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:245
+msgid "disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
+#: src/gui/popupmenu.cpp:252
+msgid "friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
+#: src/gui/popupmenu.cpp:259
+msgid "guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
+#: src/gui/popupmenu.cpp:272
+msgid "pickup"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:278
+msgid "look"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: 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
+msgid "Store"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/popupmenu.cpp:396 src/gui/storagewindow.cpp:68
+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 ""
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
+#: src/gui/recorder.cpp:40
+msgid "Recorder"
+msgstr ""
+
+#: src/gui/recorder.cpp:45
+msgid "activate"
+msgstr ""
+
+#: src/gui/recorder.cpp:88
 msgid "Finishing recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:91
+#: src/gui/recorder.cpp:92
 msgid "Not currently recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:96
+#: src/gui/recorder.cpp:97
 msgid "Already recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:104
+#: src/gui/recorder.cpp:105
 msgid "Starting to record..."
 msgstr ""
 
@@ -1138,78 +2086,232 @@ msgstr ""
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:90 src/gui/register.cpp:91
+msgid "sex"
+msgstr ""
+
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:170
+#: 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."
 msgstr ""
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:118
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:125
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/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
+msgid "Choose Your Server"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:94 src/gui/widgets/chattab.cpp:135
+msgid "Server:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:95
+msgid "Port:"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:106 src/gui/serverdialog.cpp:228
+msgid "MostUsedServerName"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:109 src/gui/serverdialog.cpp:230
+msgid "MostUsedServerPort"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:128
+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"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:129 src/gui/serverdialog.cpp:249
+msgid "addEntry"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:197
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
+#: src/gui/serverdialog.cpp:215
+msgid "MostUsedServerName0"
 msgstr ""
 
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
+#: src/gui/serverdialog.cpp:216
+msgid "MostUsedServerPort0"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
+#: src/gui/serverdialog.cpp:296
+#, c-format
+msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
+#: src/gui/serverdialog.cpp:302
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:306
+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/setup_audio.cpp:41
+#: 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 ""
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:53 src/gui/setup_audio.cpp:135
+msgid "sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:107 src/main.cpp:474
+#, c-format
+msgid "Warning: %s"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
 msgstr ""
@@ -1219,42 +2321,75 @@ msgid "Colors"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:71
-msgid "Type: "
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: 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
 msgid "Static"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
 #: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+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
-msgid "Red: "
+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
-msgid "Green: "
+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
-msgid "Blue: "
+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
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:51 src/gui/setup.cpp:62 src/gui/setup.cpp:111
+msgid "Reset Windows"
 msgstr ""
 
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
@@ -1265,6 +2400,10 @@ msgstr ""
 msgid "Calibrate"
 msgstr ""
 
+#: src/gui/setup_joystick.cpp:38
+msgid "calibrate"
+msgstr ""
+
 #: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr ""
@@ -1273,6 +2412,10 @@ 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 ""
@@ -1289,18 +2432,35 @@ 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."
+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 ": ?"
+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
 msgid "Name"
 msgstr ""
@@ -1329,6 +2489,18 @@ msgstr ""
 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
 msgid "Allow trading"
 msgstr ""
@@ -1349,6 +2521,19 @@ msgstr ""
 msgid "When ignoring:"
 msgstr ""
 
+#: src/gui/setup_video.cpp:94
+msgid "No modes available"
+msgstr ""
+
+#: src/gui/setup_video.cpp:96
+msgid "All resolutions available"
+msgstr ""
+
+#: src/gui/setup_video.cpp:103 src/gui/setup_video.cpp:452
+#: src/gui/setup_video.cpp:453
+msgid "x"
+msgstr ""
+
 #: src/gui/setup_video.cpp:112
 msgid "Tiny"
 msgstr ""
@@ -1377,350 +2562,592 @@ msgstr ""
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: 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
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:157 src/gui/setup_video.cpp:170
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:172
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:166 src/gui/setup_video.cpp:217
+#: src/gui/setup_video.cpp:534
+msgid "particleEmitterSkip"
+msgstr ""
+
+#: src/gui/setup_video.cpp:171 src/resources/monsterdb.cpp:70
+#: src/resources/monsterdb.cpp:75
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:167
-msgid "max"
+#: 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"
+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"
+msgstr ""
+
+#: src/gui/setup_video.cpp:181 src/gui/setup_video.cpp:252
+#: src/gui/setup_video.cpp:407 src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:475 src/gui/setup_video.cpp:477 src/main.cpp:329
+msgid "customcursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:182 src/gui/setup_video.cpp:253
+#: src/gui/setup_video.cpp:408 src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:479 src/gui/setup_video.cpp:481
+msgid "visiblenames"
 msgstr ""
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:183 src/gui/setup_video.cpp:254
+#: src/gui/setup_video.cpp:409 src/gui/setup_video.cpp:436
+#: src/gui/setup_video.cpp:483 src/gui/setup_video.cpp:485
+msgid "particleeffects"
+msgstr ""
+
+#: src/gui/setup_video.cpp:184 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:410 src/gui/setup_video.cpp:438
+#: src/gui/setup_video.cpp:511 src/gui/setup_video.cpp:517
+#: src/localplayer.cpp:126 src/localplayer.cpp:127 src/localplayer.cpp:135
+#: src/localplayer.cpp:1149 src/localplayer.cpp:1151
+msgid "showownname"
+msgstr ""
+
+#: src/gui/setup_video.cpp:185 src/gui/setup_video.cpp:416
+#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:497
+#: src/localplayer.cpp:972 src/localplayer.cpp:979
+msgid "showpickupchat"
+msgstr ""
+
+#: 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"
+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"
+msgstr ""
+
+#: src/gui/setup_video.cpp:190 src/gui/setup_video.cpp:260
+#: src/gui/setup_video.cpp:412 src/gui/setup_video.cpp:437
+#: src/gui/setup_video.cpp:504 src/gui/setup_video.cpp:509
+msgid "speech"
+msgstr ""
+
+#: src/gui/setup_video.cpp:193
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:194
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:195
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:197
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:199
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:201
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:202
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#: src/gui/setup_video.cpp:204
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:206
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:211
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:220 src/gui/setup_video.cpp:403
+msgid "fontSize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:222
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:228
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:229
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:230
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:231
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:449
+msgid "videomode"
+msgstr ""
+
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:495
+msgid "pickupchat"
+msgstr ""
+
+#: src/gui/setup_video.cpp:256 src/gui/setup_video.cpp:499
+msgid "pickupparticle"
+msgstr ""
+
+#: src/gui/setup_video.cpp:259 src/gui/setup_video.cpp:537
+msgid "fpslimitcheckbox"
 msgstr ""
 
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:519
+msgid "fpslimitslider"
 msgstr ""
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:262 src/gui/setup_video.cpp:524
+msgid "overlaydetailslider"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:263
+msgid "overlaydetailfield"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:530
+msgid "particledetailslider"
 msgstr ""
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:265
+msgid "particledetailfield"
+msgstr ""
+
+#: src/gui/setup_video.cpp:366
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:372
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:383
+msgid "Switching to Full Screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:384
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:396
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:397
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:459 src/gui/setup_video.cpp:464
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:460 src/gui/setup_video.cpp:465
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:462
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:468 src/main.cpp:435 src/main.cpp:884
+msgid "screenwidth"
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:469 src/main.cpp:436 src/main.cpp:886
+msgid "screenheight"
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/setup_video.cpp:491
+msgid "Particle Effect Settings Changed."
+msgstr ""
+
+#: src/gui/setup_video.cpp:492
+msgid "Changes will take effect on map change."
+msgstr ""
+
+#: src/gui/skilldialog.cpp:85 src/gui/skilldialog.cpp:87
+#: src/gui/windowmenu.cpp:58 src/gui/windowmenu.cpp:122
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:141
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:173
+msgid "skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/skilldialog.cpp:175
+#, c-format
+msgid "Error loading skills file: %s"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/skilldialog.cpp:186 src/gui/specialswindow.cpp:170
+msgid "set"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/skilldialog.cpp:189
 #, c-format
-msgid "Job: %d"
+msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/skilldialog.cpp:201
+msgid "skill"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/skilldialog.cpp:203 src/gui/specialswindow.cpp:187
+#: src/resources/itemdb.cpp:131 src/resources/monsterdb.cpp:131
+#: src/resources/monsterdb.cpp:144
+msgid "id"
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/skilldialog.cpp:204
+#, c-format
+msgid "Skill %d"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/skilldialog.cpp:205 src/gui/specialswindow.cpp:191
+msgid "icon"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
+#: src/gui/skilldialog.cpp:240 src/gui/specialswindow.cpp:212
+msgid "999"
 msgstr ""
 
-#: src/gui/status.cpp:78
-msgid "Total"
+#: src/gui/skilldialog.cpp:252 src/gui/specialswindow.cpp:222
+msgid "graphics/gui/unknown-item.png"
 msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
+#: src/gui/skilldialog.cpp:315
+#, c-format
+msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
+#: src/gui/skilldialog.cpp:320
+#, c-format
+msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
+#: src/gui/skilldialog.cpp:326 src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:177 src/resources/itemdb.cpp:182
+msgid " / "
 msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/specialswindow.cpp:84 src/gui/specialswindow.cpp:86
+#: src/gui/windowmenu.cpp:59 src/gui/windowmenu.cpp:126
+msgid "Specials"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/specialswindow.cpp:157
+msgid "specials"
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/specialswindow.cpp:159
+#, c-format
+msgid "Error loading specials file: %s"
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/specialswindow.cpp:173
+#, c-format
+msgid "Specials Set %d"
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/specialswindow.cpp:185
+msgid "special"
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
+#: src/gui/specialswindow.cpp:190
+#, c-format
+msgid "Special %d"
 msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/statuswindow.cpp:87 src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:110
+msgid "Status"
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
 msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
 msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
 msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "Job: %d"
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/statuswindow.cpp:161 src/gui/statuswindow.cpp:166 src/main.cpp:686
+msgid "C"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+msgid "Money"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/statuswindow.cpp:251
+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
+msgid "Storage"
+msgstr ""
+
+#: src/gui/textdialog.cpp:37 src/gui/textdialog.cpp:77
+msgid "CANCEL"
+msgstr ""
+
+#: src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:75 src/gui/trade.cpp:76
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:78
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
+#: src/gui/trade.cpp:78 src/gui/trade.cpp:257
+msgid "add"
+msgstr ""
+
+#: src/gui/trade.cpp:100 src/gui/trade.cpp:136
 #, c-format
-msgid "You get %s."
+msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:101
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:105
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:105 src/gui/trade.cpp:310
+msgid "money"
+msgstr ""
+
+#: src/gui/trade.cpp:276
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:319
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+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:113
+#: src/gui/updatewindow.cpp:128
+msgid "news.txt"
+msgstr ""
+
+#: src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
+#: src/gui/updatewindow.cpp:145 src/gui/updatewindow.cpp:221
+msgid "play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:254
+msgid "Couldn't load news"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:399
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#: src/gui/updatewindow.cpp:401
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#: src/gui/updatewindow.cpp:403
+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:518
+#: src/gui/updatewindow.cpp:495
 msgid "Completed"
 msgstr ""
 
@@ -1744,6 +3171,10 @@ 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 ""
@@ -1752,6 +3183,11 @@ 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 ""
@@ -1772,152 +3208,317 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
-msgid "Command: /op <nick>"
+#: 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 ""
+
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
-msgid "Command: /kick <nick>"
+#: 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 ""
+
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
+#: src/gui/widgets/chattab.cpp: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
 msgid "Global announcement:"
 msgstr ""
 
+#: src/gui/widgets/chattab.cpp:116
+msgid "##G"
+msgstr ""
+
 #: src/gui/widgets/chattab.cpp:120
 #, 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
 #, c-format
-msgid "%s whispers: "
+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/whispertab.cpp:49
+#: src/gui/widgets/chattab.cpp:235
+msgid "|"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:50
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:69
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:81
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:82
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
+#: src/gui/widgets/whispertab.cpp:86
+msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
+#: src/gui/widgets/whispertab.cpp:87
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:93
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/windowmenu.cpp:54 src/gui/windowmenu.cpp:89
+msgid ":-)"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:60 src/gui/windowmenu.cpp:130
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:61 src/gui/windowmenu.cpp:134
 msgid "Shortcut"
 msgstr ""
 
+#: src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77 src/gui/worldselectdialog.cpp:111
+msgid "world"
+msgstr ""
+
+#: src/keyboardconfig.cpp:41
+msgid "keyMoveUp"
+msgstr ""
+
 #: src/keyboardconfig.cpp:41
 msgid "Move Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:42
+msgid "keyMoveDown"
+msgstr ""
+
+#: src/keyboardconfig.cpp:42
 msgid "Move Down"
 msgstr ""
 
 #: src/keyboardconfig.cpp:43
+msgid "keyMoveLeft"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Left"
 msgstr ""
 
 #: src/keyboardconfig.cpp:44
+msgid "keyMoveRight"
+msgstr ""
+
+#: src/keyboardconfig.cpp:44
 msgid "Move Right"
 msgstr ""
 
 #: src/keyboardconfig.cpp:45
+msgid "keyAttack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:45 src/net/ea/generalhandler.cpp:216
 msgid "Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:46
+msgid "keyTargetAttack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Target & Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:47
+msgid "keySmilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:47
 msgid "Smilie"
 msgstr ""
 
 #: src/keyboardconfig.cpp:48
+msgid "keyTalk"
+msgstr ""
+
+#: src/keyboardconfig.cpp:48
 msgid "Talk"
 msgstr ""
 
 #: src/keyboardconfig.cpp:49
+msgid "keyTarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:49
 msgid "Stop Attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:50
+msgid "keyTargetClosest"
+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
 msgid "Target Player"
 msgstr ""
 
 #: src/keyboardconfig.cpp:53
+msgid "keyPickup"
+msgstr ""
+
+#: src/keyboardconfig.cpp:53
 msgid "Pickup"
 msgstr ""
 
 #: src/keyboardconfig.cpp:54
+msgid "keyHideWindows"
+msgstr ""
+
+#: src/keyboardconfig.cpp:54
 msgid "Hide Windows"
 msgstr ""
 
 #: src/keyboardconfig.cpp:55
+msgid "keyBeingSit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:55
 msgid "Sit"
 msgstr ""
 
 #: src/keyboardconfig.cpp:56
+msgid "keyScreenshot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:56
 msgid "Screenshot"
 msgstr ""
 
 #: src/keyboardconfig.cpp:57
+msgid "keyTrade"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
 msgid "Enable/Disable Trading"
 msgstr ""
 
 #: src/keyboardconfig.cpp:58
+msgid "keyPathfind"
+msgstr ""
+
+#: src/keyboardconfig.cpp:58
 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
@@ -1928,252 +3529,839 @@ msgstr ""
 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
 msgid "Status Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:73
+msgid "keyWindowInventory"
+msgstr ""
+
+#: src/keyboardconfig.cpp:73
 msgid "Inventory Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:74
+msgid "keyWindowEquipment"
+msgstr ""
+
+#: src/keyboardconfig.cpp:74
 msgid "Equipment Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:75
+msgid "keyWindowSkill"
+msgstr ""
+
+#: src/keyboardconfig.cpp:75
 msgid "Skill Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:76
+msgid "keyWindowMinimap"
+msgstr ""
+
+#: src/keyboardconfig.cpp:76
 msgid "Minimap Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:77
+msgid "keyWindowChat"
+msgstr ""
+
+#: src/keyboardconfig.cpp:77
 msgid "Chat Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:78
+msgid "keyWindowShortcut"
+msgstr ""
+
+#: src/keyboardconfig.cpp:78
 msgid "Item Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:79
+msgid "keyWindowSetup"
+msgstr ""
+
+#: src/keyboardconfig.cpp:79
 msgid "Setup Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:80
+msgid "keyWindowDebug"
+msgstr ""
+
+#: src/keyboardconfig.cpp:80
 msgid "Debug Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:81
+msgid "keyWindowParty"
+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 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:83
+msgid "keyWindowOutfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:83
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "keyEmoteShortcut1"
+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
 #, 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 "Toggle Chat"
+msgid "keyEmoteShortcut12"
 msgstr ""
 
 #: src/keyboardconfig.cpp:96
-msgid "Scroll Chat Up"
+msgid "keyChat"
+msgstr ""
+
+#: src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
 msgstr ""
 
 #: src/keyboardconfig.cpp:97
-msgid "Scroll Chat Down"
+msgid "keyChatScrollUp"
+msgstr ""
+
+#: src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:98
-msgid "Previous Chat Tab"
+msgid "keyChatScrollDown"
+msgstr ""
+
+#: src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
 msgstr ""
 
 #: src/keyboardconfig.cpp:99
-msgid "Next Chat Tab"
+msgid "keyChatPrevTab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
 msgstr ""
 
 #: src/keyboardconfig.cpp:100
+msgid "keyChatNextTab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:101
+msgid "keyOK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
 #: src/keyboardconfig.cpp:102
-msgid "Ignore input 1"
+msgid "keyQuit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:103
+msgid "keyIgnoreInput1"
 msgstr ""
 
 #: src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr ""
+
+#: src/keyboardconfig.cpp:104
+msgid "keyIgnoreInput2"
+msgstr ""
+
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
+#: src/localplayer.cpp:695
+#, c-format
+msgid "SpecialUpdate Skill #%d -- (%d/%d) -> %d"
 msgstr ""
 
-#: src/localplayer.cpp:761
-msgid "Knife"
+#: src/localplayer.cpp:782
+msgid "sfx/fist-swish.ogg"
 msgstr ""
 
-#: src/localplayer.cpp:762
-msgid "Sword"
+#: src/localplayer.cpp:888
+#, c-format
+msgid "%d %s xp"
+msgstr ""
+
+#: src/localplayer.cpp:928
+msgid " xp"
 msgstr ""
 
-#: src/localplayer.cpp:763
-msgid "Polearm"
+#: src/localplayer.cpp:974
+msgid "Unable to pick up item."
+msgstr ""
+
+#: src/localplayer.cpp:983 src/localplayer.cpp:984
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
 msgstr ""
 
-#: src/localplayer.cpp:764
-msgid "Staff"
+#: src/localplayer.cpp:1093
+msgid "graphics/gui/target-cursor-blue-s.png"
 msgstr ""
 
-#: src/localplayer.cpp:765
-msgid "Whip"
+#: src/localplayer.cpp:1095
+msgid "graphics/gui/target-cursor-red-s.png"
 msgstr ""
 
-#: src/localplayer.cpp:766
-msgid "Bow"
+#: src/localplayer.cpp:1097
+msgid "graphics/gui/target-cursor-blue-m.png"
 msgstr ""
 
-#: src/localplayer.cpp:767
-msgid "Shooting"
+#: src/localplayer.cpp:1099
+msgid "graphics/gui/target-cursor-red-m.png"
 msgstr ""
 
-#: src/localplayer.cpp:768
-msgid "Mace"
+#: src/localplayer.cpp:1101
+msgid "graphics/gui/target-cursor-blue-l.png"
 msgstr ""
 
-#: src/localplayer.cpp:769
-msgid "Axe"
+#: src/localplayer.cpp:1103
+msgid "graphics/gui/target-cursor-red-l.png"
 msgstr ""
 
-#: src/localplayer.cpp:770
-msgid "Thrown"
+#: src/main.cpp:202 src/main.cpp:328
+msgid "updatehost"
 msgstr ""
 
-#: src/localplayer.cpp:772
-msgid "Craft"
+#: src/main.cpp:202
+msgid "http://updates.themanaworld.org/"
 msgstr ""
 
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
+#: src/main.cpp:211
+msgid "://"
 msgstr ""
 
-#: src/main.cpp:263
-msgid "Invalid update host: "
+#: src/main.cpp:216 src/main.cpp:229
+msgid "updates/"
 msgstr ""
 
-#: src/main.cpp:296 src/main.cpp:302
+#: 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:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/main.cpp:259
+#, c-format
+msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/main.cpp:281
+msgid "/Library/Application Support/"
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
+#: src/main.cpp:282 src/main.cpp:371
+msgid "appName"
 msgstr ""
 
-#: src/main.cpp:575
+#: 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:576
+#: 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
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: 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"
+msgstr ""
+
+#: src/main.cpp:526
+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"
+msgstr ""
+
+#: src/main.cpp:529
+msgid "  -H --update-host    : Use this update host"
+msgstr ""
+
+#: src/main.cpp:530
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#: src/main.cpp:531
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#: src/main.cpp:532
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#: src/main.cpp:533
+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:578
-msgid "  -d --data        : Directory to load game data from"
+#: src/main.cpp:1025
+msgid "customdata/"
 msgstr ""
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:1026
+msgid "zip"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:1046
+msgid "State: GET CHARACTERS"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:1051
+msgid "State: CHAR SELECT"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:1064 src/main.cpp:1079
+msgid "lastCharacter"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:1070
+msgid "State: CONNECT GAME"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: 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:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:1175
+msgid "Email changed successfully!"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:1181
+msgid "State: UNREGISTER"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:1186
+msgid "State: UNREGISTER ATTEMPT"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:1192
+msgid "State: UNREGISTER SUCCESS"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:1195
+msgid "Unregister Successful"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:1196
+msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
+#: src/main.cpp:1204
+msgid "State: SWITCH SERVER"
 msgstr ""
 
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:1213
+msgid "State: SWITCH LOGIN"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
+#: src/main.cpp:1221
+msgid "State: SWITCH CHARACTER"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:66
+#: src/main.cpp:1230
+msgid "State: LOGOUT ATTEMPT"
+msgstr ""
+
+#: src/main.cpp:1235
+msgid "State: WAIT"
+msgstr ""
+
+#: src/main.cpp:1239
+msgid "State: EXIT"
+msgstr ""
+
+#: src/main.cpp:1244
+msgid "State: FORCE QUIT"
+msgstr ""
+
+#: src/main.cpp:1251
+msgid "State: ERROR"
+msgstr ""
+
+#: src/main.cpp:1275
+msgid "Quitting"
+msgstr ""
+
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
+#: src/net/ea/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
 msgid "Nothing to sell."
 msgstr ""
@@ -2194,63 +4382,68 @@ msgstr ""
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:75
+#, c-format
+msgid "CharServerHandler: Packet ID: %x, Length: %d"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:91
+#, c-format
+msgid "CharServer: Player: %s (%d)"
 msgstr ""
 
 #: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
-msgid "Failed to create character. Most likely the name is already taken."
+#: src/net/ea/charserverhandler.cpp:104
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Info"
+#: src/net/ea/charserverhandler.cpp:107
+msgid "Unknown failure to select character."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:129
+msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:142
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:148
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:309
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:242 src/net/manaserv/charhandler.cpp:310
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:243 src/net/manaserv/charhandler.cpp:312
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:244 src/net/manaserv/charhandler.cpp:313
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:245 src/net/manaserv/charhandler.cpp:311
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:246
 msgid "Luck:"
 msgstr ""
 
+#: src/net/ea/charserverhandler.cpp:284
+msgid "a@a.com"
+msgstr ""
+
 #: src/net/ea/chathandler.cpp:78
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
@@ -2259,6 +4452,15 @@ msgstr ""
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
+#: src/net/ea/chathandler.cpp:169
+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
@@ -2266,76 +4468,170 @@ msgstr ""
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:74
+#, c-format
+msgid "Protocol: Player start position: (%d, %d), Direction: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:87
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/gamehandler.cpp:101
+msgid "Game"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:101
+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
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: 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
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: 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
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: 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
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: 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
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:101
+msgid "luck"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:101
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:119
+#, c-format
+msgid "Connection problem: %i"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:123
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:126
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:133
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:136
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:139
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:142
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:197
 msgid "Got disconnected from server!"
 msgstr ""
 
+#: src/net/ea/generalhandler.cpp:209 src/net/manaserv/generalhandler.cpp:169
+msgid "Strength"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:210 src/net/manaserv/generalhandler.cpp:170
+msgid "Agility"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:211 src/net/manaserv/generalhandler.cpp:172
+msgid "Vitality"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:212 src/net/manaserv/generalhandler.cpp:173
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:213 src/net/manaserv/generalhandler.cpp:171
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:214
+msgid "Luck"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:217
+msgid "Defense"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:218
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:219
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:220
+#, c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:221
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:222
+#, c-format
+msgid "% Critical"
+msgstr ""
+
 #: src/net/ea/gui/partytab.cpp:55
 msgid "/help > Display this help."
 msgstr ""
@@ -2380,10 +4676,18 @@ msgstr ""
 msgid "These commands create a new party called <party-name>."
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:75 src/net/ea/gui/partytab.cpp:117
+msgid "invite"
+msgstr ""
+
 #: src/net/ea/gui/partytab.cpp:77
 msgid "Command: /invite <nick>"
 msgstr ""
 
+#: src/net/ea/gui/partytab.cpp:82 src/net/ea/gui/partytab.cpp:121
+msgid "leave"
+msgstr ""
+
 #: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /leave"
 msgstr ""
@@ -2392,6 +4696,11 @@ msgstr ""
 msgid "This command causes the player to leave the 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"
+msgstr ""
+
 #: src/net/ea/gui/partytab.cpp:89
 msgid "Command: /item <policy>"
 msgstr ""
@@ -2414,6 +4723,11 @@ msgstr ""
 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
 msgid "Command: /exp <policy>"
 msgstr ""
@@ -2440,128 +4754,262 @@ msgstr ""
 msgid "Party name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:193
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:199
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:205
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:145
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:170
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:176
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:177 src/net/ea/partyhandler.cpp:182
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
-msgstr ""
-
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/gui/partytab.cpp:180
+msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
+#: src/net/ea/inventoryhandler.cpp:152 src/net/ea/inventoryhandler.cpp:193
 #, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+msgid ""
+"Index: %d, ID: %d, Type: %d, Identified: %d, Qty: %d, Cards: %d, %d, %d, %d"
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
+#: src/net/ea/inventoryhandler.cpp:262
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/inventoryhandler.cpp:358
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:372
+msgid "Unable to unequip."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:392
+#, c-format
+msgid "Arrows equipped: %i"
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:78
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:81 src/net/manaserv/loginhandler.cpp:116
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:84
+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
+msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:102
+#, c-format
+msgid "Received update host \"%s\" from login server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
+#: src/net/ea/loginhandler.cpp:131
+#, c-format
+msgid "Network: Server: %s (%s:%d)"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
+#: src/net/ea/loginhandler.cpp:143
+#, c-format
+msgid "Login::error code: %i"
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:147
+msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:150
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:153
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
-msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+#: src/net/ea/loginhandler.cpp:156
+msgid "Rejected from server."
 msgstr ""
 
 #: src/net/ea/loginhandler.cpp:159
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:163
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:170
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:257
+msgid "_F"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: 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."
+msgstr ""
+
+#: src/net/ea/network.cpp:411
+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
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:116
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:120
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:124
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:128
 #, 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
 msgid "You have left the party."
 msgstr ""
@@ -2585,223 +5033,248 @@ msgstr ""
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:268
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:269
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:271
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:272
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:273
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:274
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:276
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:278
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:279
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:280
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:281
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:282
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:283
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp: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
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:243
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:324
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:360
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:521
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: 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 ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:117
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:118
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
@@ -2844,110 +5317,307 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:150
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:157
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:288
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:289
+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
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:121
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:199
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:202
+msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/charhandler.cpp:205
+msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:208
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:211
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:214
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:217
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:220
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:223
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:260
+#, c-format
+msgid "Game server: %s:%d"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:262
+#, c-format
+msgid "Chat server: %s:%d"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:291
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:314
 msgid "Willpower:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: 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
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:193 src/net/manaserv/chathandler.cpp:273
+msgid "@"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:215
+msgid " - "
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:102
+msgid "will"
+msgstr ""
+
+#: src/net/manaserv/generalhandler.cpp:102
 #, c-format
 msgid "Willpower %+d"
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:174
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:76
+msgid "Received CPMSG_GUILD_CREATE_RESPONSE"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:80
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:85
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:91
+msgid "Received CPMSG_GUILD_INVITE_RESPONSE"
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:95
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: 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
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:214
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/guildhandler.cpp:220
+msgid "Received CPMSG_GUILD_REJOIN"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/guildhandler.cpp:227
+msgid "Received CPMSG_GUILD_QUIT_RESPONSE"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:83
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:260
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
-msgid "Account not connected. Please login first."
+#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:263
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:113
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:119 src/net/manaserv/loginhandler.cpp:149
+msgid "Account not connected. Please login first."
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:146
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:176
+msgid "Accountserver: Not logged in"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:179 src/net/manaserv/loginhandler.cpp:203
+msgid "Accountserver: Unknown error"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:200
+msgid "Accountserver: Wrong username or password"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:222
+#, c-format
+msgid "%s: %s\n"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:231
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:254 src/net/manaserv/loginhandler.cpp:290
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:257
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:293
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:296
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:299
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:302
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
 #: src/net/manaserv/partyhandler.cpp:86
@@ -2959,47 +5629,463 @@ msgstr ""
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:120
+#, 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 ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:136
 #, 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
+msgid "Completely ignore"
+msgstr ""
+
+#: src/playerrelations.cpp:310
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:311
+msgid "dotdotdot"
+msgstr ""
+
+#: src/playerrelations.cpp:316
+msgid "..."
+msgstr ""
+
+#: src/playerrelations.cpp:326
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:327
+msgid "blinkname"
+msgstr ""
+
+#: src/playerrelations.cpp:363
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:366
+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
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
+#: 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/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: 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/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 ""